restore User.hbm.xml
restore
Merge branch 'login'
just nessisary
still need to complete the validate