Merge branch 'feature-language-support' of C:\workspace\server\cameoJSClient with conflicts.
Merge remote-tracking branch 'origin/feature-language-support' into feature-language-support

Conflicts:
	app/index.html
	app/tpl/form/login.html
update API Url