Merge branch 'chirowong-master'
fix
Merge branch 'chirowong-master'
commit EnableDisableStatusConverter and GenderConverter
Merge branch 'chirowong-master'
fix user/*.jsp
fix Resource.java
use @Convert into user
一小波改动
fix success.jsp and userInput.jsp
fix userInput.jsp
Merge pull request #13 from JSHgithub/master

a new pull request for chirowong merge JSHgithub
优化
Merge branch 'master' of github.com:chirowong/cms
merge zzq
Merge pull request #25 from chirowong/master

201412272