some changes
Merge branch 'dev_map' of github.com:tinh/breath_of_time into dev_map

recup remote version