Update: move .html to .hbs (part 1)
Merge branch 'develop' of github.com:opendream/sicksense-web into develop

Conflicts:
	app/login.html
	app/register.html
	app/verify.html
	app/views/login.html
	login.html