Merge pull request #6 from aquameta/master

Packet of a few cosmetic changes before testing
Fixes #163.
Redirect after login on the mobile app.
Fixes edit. Fixes #167 and #166.
Fixes for #156 and some of #164.
Merge pull request #7 from aquameta/master

Signup styling
Fixes #165.
Fixes 154.
Fixes #153.
Fixes #153.
Should fix #155.
Merge branch 'master' of github.com:point97/survey-demo

Conflicts:
	server/templates/registration/registration_form.html
Update Ecotrust company logo
Update Ecotrust company logo
Update bottomNav.html
Update hapifis_admin_base.html
Update hapifis_admin_base.html
Add register page image
Update registration_form.html
Update registration_form.html