Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Remove Resource sqlmap and move functionality to Hibernate.
Merge pull request #327 from RikTyer/hib02

Move Resource persistence to Hibernate.