Merge branch 'master' of https://github.com/OpenBuildings/emp

Conflicts:
	.gitignore
	composer.json
remove old files