Follow the Arrow...this has to go to the gradle-y-fied build. I'm sick of Maven in combination with Android
Merge branch 'master' into arrow

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml
make it safe for ICS
check for the correct Google Play Service
Add GDE Directory Client
Add GdeActivity and GdeListFragment
Add GDE to NavDrawer
Merge branch 'master' into arrow
make arrow activity scrollable and use 50x50 gplus image
only show arrow menu when device supports NFC
fix intent filter
add state update, add organizer image, refactor start of day, connect api client on scan result
Merge branch 'arrow' of github.com:gdg-x/frisbee into arrow
upload tagged persons
submit score to leaderboard
handle conflict
add show method to all toasts
add arrow leaderboard
Add GdeAdapter and UI
ModelCache Bugfix. Allow to serialize/deserialize HashMaps with ArrayList values