cleaning up
Merge branch 'master' into localBranch

Conflicts:
	UI/app/controllers/user.js
	UI/public/js/people.js
imcomplete Messages Code
implemeted the other two methods and changed some processMethods code
finished backend for exchange status
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
trying to get this to work
Merge branch 'master' into localBranch
trying to merge
Merge branch 'master' into localBranch