Access to database configured
Merge branch 'master' of https://github.com/yurynino/bookflow

Conflicts:
	nbproject/private/private.properties
	setup/glassfish-resources.xml
	src/conf/persistence.xml
	web/WEB-INF/glassfish-web.xml
Netbeans Configuration files ignored