add choosing view
Merge branch 'master' of github.com:tantofish/PirateHelper

Conflicts:
	AndroidManifest.xml
	project.properties
	src/wcm/tuwolf/piratehelper/MainActivity.java