Added message models conversation, message and edited user model
One to one message system implemented
Merge branch 'messagesystem' of https://github.com/StyleASD/team_citadel

Conflicts:
	app/controllers/DeckController.php
	app/models/User.php
	app/routes.php
	app/views/profile.blade.php
	composer.json
Merge branch 'master' of https://github.com/StyleASD/team_citadel into messagesystem

Conflicts:
	app/controllers/DeckController.php
	app/models/User.php
	app/routes.php
	app/views/profile.blade.php
	composer.json
Merge branch 'master' of https://github.com/StyleASD/team_citadel into messagesystem
Merge branch 'messagesystem' of https://github.com/StyleASD/team_citadel

Conflicts:
	app/controllers/DeckController.php