Merge branch 'develop' into integration
Debug the log system
Correct a bug when the gen map duplicate the gateway
Correct a bug key bind on the map control
Little error
Merge branch 'integration' into develop
Add a view filter