Security fix
Merge branch 'personal_messages'

Conflicts:
	app/controllers/messages_controller.rb