Removed Compass/Sass as it keeps making the build crash, and it's not in the default generator options anyway
Merge branch 'master' of https://github.com/jhipster/jhipster-docker

Conflicts:
	Dockerfile