Start login rewriting to angularjs
Merge branch 'master' of https://github.com/barbatus/GimmeRide

Conflicts:
	client/views/login/login.html
	client/views/login/login_frm_ng.html