Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

Dockerfile

@@ -1,5 +1,13 @@
-FROM kolobus/ubuntu:komodo
-MAINTAINER Mihail Fedorov <tech@fedorov.net>
+FROM ubuntu:16.04
+MAINTAINER Mihail Fedorov <kolo@komodoplatform.com>
+
+RUN apt-get -y update && \
+    apt-get -y upgrade && \
+    apt-get -y install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev \
+    unzip python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev \
+    protobuf-compiler libqrencode-dev libdb++-dev software-properties-common libcurl4-openssl-dev curl && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 ADD ./ /komodo
 ENV HOME /komodo