change project fix
Merge branch 'master' of https://github.com/naitse/tcm-ui-angular

Conflicts:
	app/js/apiModel.js