merged
Merge branch 'master' of https://github.com/anetfreak/TodoStalker

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/TodoStalker.apk
	bin/classes.dex
	bin/resources.ap_