sync
sync
sync
sync
sync
Merge branch 'master' of https://github.com/holmesli/ToMore

Conflicts:
	bin/ToMoreTest.apk
	bin/classes.dex
	bin/resources.ap_