update model from JPA project
update new model from JPA
update repos
merge branch 'master' of https://github.com/chynchwen/pet

Conflicts:
	misc/plan.txt
	src/main/java/cc/pet/user/model/User.java
	src/test/java/cc/pet/user/dao/UserTest.java
update at home