Remove .row on alert box
Merge branch 'develop' of github.com:opendream/sicksense-web into develop

Conflicts:
	app/views/change-password.html
Merge branch 'develop' of github.com:opendream/sicksense-web into develop