commit to merge
Merge branch 'master' of github.com:teamgrau/altourism
altourism-23 Story Provider Foursquare (3 days) closes #23
commit to pull
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/teamgrau/altourism/util/data/StoryProvider.java
	src/com/teamgrau/altourism/util/data/StoryProviderHardcoded.java