added
Merge branch 'master' of https://github.com/macrozone/henri

Conflicts:
	app/packages/.gitignore