Fix namespace issue
Merge branch 'master' of https://github.com/commercial-hippie/chocolate

Conflicts:
	composer.json