Emergency commit =)
Improved conversations
Merge branch 'master' into conversations fix #35

Conflicts:
	app/models/ability.rb
	config/routes.rb
	db/schema.rb
Merge branch 'master' into conversations

Conflicts:
	app/models/ability.rb
	app/models/news.rb
	db/schema.rb
Merge branch 'master' into conversations
Added mail notifier to conversations
Merge branch 'conversations'