update
Merge branch 'develop' of https://github.com/hirsch88/ui5-boilerplate into develop

Conflicts:
	app/src/Application.js