Merge branch 'master' of github.com:prohfesor/chocolate

Conflicts:
	composer.lock
fos user config