Added JPA annotations
Merge branch 'master' of github.com:Dissem/Wicked-Board
Merge branch 'master' of github.com:Dissem/Wicked-Board