aaa
Merge branch 'master' of https://github.com/tkminh/hottestreader

Conflicts:
	AndroidManifest.xml