－123
Merge branch 'master' of github.com:zhengpeiyang/SpecialEffects

Conflicts:
	SpecialEffects/src/com/cn/zpy/main/MainActivity.java