Adding Users to the Nav and altered the schema for messages
Merge branch 'feature/drag-drop-users' into develop

Conflicts:
	client/app/feed/feed.html