lll
Merge branch 'master' of https://github.com/hm9408/Autominder.git

Conflicts:
	Autominder/bin/Autominder.apk
	Autominder/bin/classes.dex