strings,manifest,properties
Merge branch 'siagabanjir-v2' of https://github.com/reyreina/Siaga-Banjir into siagabanjir-v2

Conflicts:
	AndroidManifest.xml
	project.properties
Merge branch 'siagabanjir-v2' of https://github.com/reyreina/Siaga-Banjir into siagabanjir-v2
actionbar in fragment