yup
Merge branch 'master' of github.com:teamgrau/altourism

Conflicts:
	src/com/teamgrau/altourism/FullscreenActivity.java
minor changes