Profile Sidebar Menu
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/MessagesCtrl.js
Sniffsters Styles
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/HomeCtrl.js