fix problem with apt-get
Merge branch 'master' of github.com:pkoperek/mesos-plgrid

Conflicts:
	base_install.sh.template