Merge branch 'master' of https://github.com/jessehwong/itmaster.git

Conflicts:
	src/i18n_en_US.properties
	src/i18n_zh_CN.properties
	src/itmaster/vo/User-validation.xml
Merge branch 'master' of https://github.com/jessehwong/itmaster.git