Merge pull request #157 from KurtStam/master

fixing Resource annotation
SRAMP-121 first upgrading to 3.1.0.Final
Merge branch 'master' of git://github.com/Governance/s-ramp