#44 configured JPA and Derby database
merged conflicts