user db is done
Merge branch 'master' of https://github.com/Nathan1994/Wishes

Conflicts:
	struts/WebRoot/SigninError.html
change user.email to user.name in error html