Configuration Hibernate
Merge branch 'master' of https://github.com/botzzz/sentinel

Conflicts:
	sentinelAPI/.gitignore
	sentinelClient/.classpath
	sentinelClient/.gitignore
	sentinelClient/target/m2e-wtp/web-resources/META-INF/maven/opl/sentinelClient/pom.properties