初始化
Merge branch 'master' of https://github.com/gn715364/spring3-jpa-jta-hibernate4

Conflicts:
	.gitignore