test
Merge branch 'master' of git@github.com:haozileung/JFMS.git

Conflicts:
	src/main/java/com/haozileung/jfms/domain/User.java
	src/main/resources/ehcache.xml
删除旧文件