encryption

encryption while registeration
Merge remote-tracking branch 'origin/master'

Conflicts:
	war/model/views/common/index.html
	war/resources/images/banner.jpg
Merge remote-tracking branch 'origin/master'

Conflicts:
	war/model/views/common/index.html
	war/resources/css/second.css
	war/resources/html/index.jsp
	war/resources/images/banner.jpg