55
Signed-off-by: Pelephone <Pelephone@163.com>
Merge branch 'master' of https://github.com/Pelephone/as3Cell

Conflicts:
	test.txt