merge develop to master
Merge remote-tracking branch 'remotes/origin/develop'
release bin of 1.1
Optimize
modified effect data