registration modification
Merge branch 'master' of https://github.com/NewHorizion/MyProp

Conflicts:
	war/src/main/webapp/pages/registrationModel.html
	web/src/main/java/com/vstar/ui/registration/RegistrationAction.java