Merge pull request from easylogic/develop support flex layout editor