Fix for Issue 10:
Mixing models on one page
Fix for issue 10
Merge branch 'master' of https://github.com/stefan79/ProjectConfig

Conflicts:
	web-app/js/app/main.js