Initial attempt at converting to annotations
Finalised JPA annotation setup using getters
Readding default constructor required for tests
Merge pull request #2 from rapilabs/jpa-annotations

Conversion to JPA annotations
Corrected a couple of relationship/enum configurations
minor update o assertion and method name
Merge remote-tracking branch 'upstream/master' with Dave's jpa annotations changes

Removed the delete proposed concept service as the orphanRemoval is working now