for release war and login
login and release war
Merge branch 'master' of https://github.com/zhonghuali/fjj

Conflicts:
	src/main/webapp/WEB-INF/config/sitemesh/decorators.xml
	src/main/webapp/example/HelloWorld.jsp
	src/main/webapp/views/login.jsp