Working JPA

JPA FINALLY WORKS!
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/META-INF/persistence.xml