22/07/13 Afternoon Commit

Datamodel Integrity tested - working with JPA.