Fix running tests.
Fix signup process when submitting from error page.
Merge branch 'master' into gsa

Conflicts:
	Gemfile.lock