Rest server
Modifs rest
Merge branch 'master' of https://github.com/SmartCampus/bridge

Conflicts:
	bridge/ControllerDatas/controller.cfg