fixes
Merge branch 'master' of github.com:flatlining/openui5.semana_icet

Conflicts:
	icet/main.controller.js