no message
Merge branch 'master' of https://github.com/julianschmidlmuc/stp_prototype

Conflicts:
	scripts/fmg/viewModels/HomepageViewModel.js