minor tidying-up
Merge branch 'master' of git@github.com:Josvanegmond/androidmoonbase

Conflicts:
	MoonVille/AndroidManifest.xml
	MoonVille/src/spaceappschallenge/moonville/activities/BaseOverviewActivity.java
Merge branch 'master' of git@github.com:Josvanegmond/androidmoonbase
added pitch for challenge submission