peer review next
Merge branch 'master' of https://github.com/swsrini/HT-NewArch

Conflicts:
	assets/www/js/views/authentication/login_view.js