Manifest
Dialog
Merge branch 'master' of https://github.com/victorcsv/NatuurBeach.git

Conflicts:
	res/values/strings.xml
	src/br/gov/ce/semace/natuurbeach/MainActivity.java