small changes before merging Abmar's code
Merge branch 'master' of github.com:buddycloud/dockerfiles

Conflicts:
	buddycloud-stack/Dockerfile