updated reg page error handling
Merge branch 'master' of https://github.com/dordal/userballot

Conflicts:
	app/scripts/controllers/signup.js
	app/views/signup.html