Updated Signup Controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/java/controller/SignupController.java
	web/index.xhtml