Network in your face
Process of receive/send file on TCP Socket
TCP: Reception and send of file
Commit bis
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
remove .idea files
Merge branch 'master' of https://github.com/meshoui/linux

fix
Branch Network merged