Merge branch 'hotfix/Fix_email_address'
Mostly Tickets -> Membership changes.
A few minor wording tweaks.
Merge branch 'master' into develop
Merge branch 'develop' into feature/better_login_box

Conflicts:
	app/views/layouts/_login.html.haml