SRAMP-10, fixing the @Resource by adding a beans.xml, taking out the
workaround.
Merge branch 'master' of git://github.com/Governance/s-ramp
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
Merge pull request #158 from KurtStam/master

upgrading to modeshape 3.1.0.Final
Support for overriding the artifact type when deploying an artifact from
maven into s-ramp.
Merge pull request #159 from EricWittmann/sramp-switchyard

Added support for custom artifact types in maven integration