changed app header, now using a png
Merge branch 'master' of github.com:teamgrau/altourism
commit to pull (on our way to new stories)
Merge branch 'master' of github.com:teamgrau/altourism into new_story

Conflicts:
	res/layout/altourism_info_window.xml
Merge branch 'master' of github.com:teamgrau/altourism into new_story

Conflicts:
	res/layout/altourism_info_window.xml
Merge branch 'master' of github.com:teamgrau/altourism into new_story

Conflicts:
	res/layout/altourism_info_window.xml
various improvements
some improvements
commit to merge master with new story
commit to merge master with new story
Merge branch 'master' of github.com:teamgrau/altourism into branch_to_merge
commit to merge
commit to merge