ti
Merge branch '2' of https://github.com/db1600800/mobile into 2

Conflicts:
	bin/classes/com/compoment/cutpic/IosTableViewControlCreater.class