Merge branch 'master' into ChristianSkyumLarsen
Added highscores activity, minor modification to newjoingame
Merge branch 'ChristianSkyumLarsen'

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
Conflicts fixed