[RG, MH] Add Settings-Class and refectoring MainActivity implementation
& test cases.
Merge branch 'master' of https://github.com/renegau/sw14_free_36.git

Conflicts:
	BeachvolleyAssist/src/com/example/beachvolleyassist/MainActivity.java