changes for room and messages
add for pull
Conflict resolved
commit before removal
removal of pyc file in folder 'controller'
changement de textes génants...
Merge branch 'master' of https://github.com/meshoui/linux into Network

Conflicts:
	controller/ActionManager.pyc
	controller/ContactController.pyc
	controller/EventController.pyc
	controller/FileController.pyc
	controller/GroupController.pyc
	controller/MessageController.py
	controller/MessageController.pyc
	controller/RoomController.pyc
	controller/UserController.pyc
	model/sqlalchemy/data.db
	network/Meshoui_pb2.pyc