Add LogicMap, LogicObject...
Modified ClientLogic
before pull
after pull
push commit
before merge server
before merge server
after merge develop
merge with server done