login/register start
Merge remote-tracking branch 'origin/integration-development' into integration-development

Conflicts:
	app/index.html