wradadadaa
merger
Merge branch 'temp' of https://github.com/teamreactive/cuboclient into temp

Conflicts:
	app/login/login.html
	app/login/signin/signin.js