log message here:first version
Merge branch 'master' of https://github.com/CHENJing88/Biblioth-que-J2EE

Conflicts:
	pom.xml