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

Conflicts:
	app/models/ability.rb
	config/routes.rb
	db/schema.rb
Merge
Merge pull request #7 from Bazay/master

Added Private Messaging system (basic) and prettied up the bootstrap a little
Merge remote-tracking branch 'upstream/master'
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
fix homepage
Merge remote-tracking branch 'upstream/master'
Added autocomplete to compose message