Merge pull request #18 from vivenkat/localBranch

Local branch
working prototype for status update:
changed port in server.js
cleaning up
Merge branch 'master' into localBranch

Conflicts:
	UI/app/controllers/user.js
	UI/public/js/people.js
imcomplete Messages Code