jpa annotation change
Merge branch 'master' of https://github.com/PepticSet/SwEng2014Team2