Upgraded hibernate version.
resolving conflicts
resolve conflict
Checking in to resolve conflict.
Checking in to resolve conflict.
Merge branch 'master' of https://github.com/ECLabs/Bookbook

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.core.resources.prefs
	application.properties
Added some logging.
Remove exception handling around HTTP call to google.
updated version