Fix bug
Merge branch 'master' of https://github.com/Chocobozzz/Diaspora-Docker

Conflicts:
	dev/nginx_mysql/install.sh