made updates
Merge branch 'master' of https://github.com/gjbianco/jboss-elock

Conflicts:
	pom.xml
	src/main/resources/META-INF/persistence.xml
	src/test/java/org/jboss/as/elock/persistence/dao/CardDaoTest.java
	src/test/java/org/jboss/as/elock/persistence/dao/DoorDaoTest.java