Add support for messages
Minor fixes to messages
Merge branch 'message-feature'

Conflicts:
	.gitignore
	app/models/user.rb
	config/routes.rb
	db/schema.rb