auth baron
Merge pull request #5 from shal23/master

Tags
Apply personal changes; authentication and team posts
Resolved upstream and HEAD discrepancies
Merge pull request #6 from Bazay/master

Updates
add conversations scaffold
Merge remote-tracking branch 'origin/master' into authorisation

Conflicts:
	app/models/ability.rb
	config/routes.rb
	db/schema.rb
Merge
Added basic styles
Finish basic message system
Merge remote-tracking branch 'upstream/master'
Commit unstaged changes
Merge pull request #7 from Bazay/master

Added Private Messaging system (basic) and prettied up the bootstrap a little
Added notifications for messages and forward and reply message abilities
merge barons changes
Merge pull request #8 from Bazay/master

Added notification for messages, reply and forward mail abilities, and inbox/sent items/trash mailboxes
merge barons updates
commit
commit
fix homepage