update
Merge branch 'master' of https://github.com/AserSayHi/ANE_IFly

Conflicts:
	android/IFlytek/.idea/workspace.xml