register error
Merge remote-tracking branch 'remotes/origin/register' into register
I did something
registration
register
Merge branch 'master' into register

Conflicts:
	Resources/allSQL.sql
	WebContent/index.jsp
	src/app/shopnanza/action/LoginAction.java
	src/app/shopnanza/dao/UserDao.java
	src/struts.xml
Merge branch 'master' into register
<s:property value="#session.name"/> to refer to the user that just registered or logged in.