cleaning up
Merge branch 'localBranch' of github.com:vivenkat/FSEProjectOurs into localBranch

Conflicts:
	RESTBackend/src/main/java/edu/cmu/sv/ws/ssnoc/data/dao/MessageDAOImpl.java