tampilan help
Merge branch 'master' of github.com:igrir/teroka

Conflicts:
	AndroidManifest.xml