20140110 commit
20140116
20130116
Merge branch 'master' of git@github.com:sidneyzhang/myspring.git

Conflicts:
	src/main/resources/spring/persist.xml