Merge pull request #215 from KurtStam/master

fixing failing test on jenkins
Merge pull request #216 from KurtStam/master

debuggin failing test
Merge pull request #217 from KurtStam/master

debuggin failing test
Merge pull request #218 from KurtStam/master

replacing deprecated reference to junit.framework
Cleaned up some java and maven warnings.
Merge pull request #219 from EricWittmann/warning-cleanup-2013-03-26

Cleaned up some java and maven warnings.
SRAMP-164 updating to the official S-RAMP namespace