remove developmentspecific raise
fixing tests
fixing locale for sign_up page
Merge branch 'staging' into 683-welcome_page_after_sign_up

Conflicts:
	config/locales/en.yml