commiting to appease mighty git
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team2

Conflicts:
	UnisportBern/AndroidManifest.xml
	UnisportBern/bin/AndroidManifest.xml
	UnisportBern/bin/UnisportBern.apk
	UnisportBern/bin/classes.dex
	UnisportBern/bin/classes/ch/unibe/unisportbern/support/DBMethodes.class
	UnisportBern/bin/classes/ch/unibe/unisportbern/support/JsonCoordinate.class
	UnisportBern/bin/classes/ch/unibe/unisportbern/views/MainActivity.class
	UnisportBern/bin/classes/ch/unibe/unisportbern/views/details/SportsAdapter$1.class
	UnisportBern/bin/classes/ch/unibe/unisportbern/views/details/SportsAdapter$2.class
	UnisportBern/bin/classes/ch/unibe/unisportbern/views/details/SportsAdapter$3.class
	UnisportBern/bin/classes/ch/unibe/unisportbern/views/details/SportsAdapter.class
	UnisportBern/bin/classes/com/example/unisportbern/R$id.class
	UnisportBern/bin/classes/com/example/unisportbern/R$layout.class
	UnisportBern/bin/classes/com/example/unisportbern/R$menu.class
	UnisportBern/bin/classes/com/example/unisportbern/R$string.class
	UnisportBern/bin/classes/com/example/unisportbern/R$style.class
	UnisportBern/bin/resources.ap_
	UnisportBern/gen/com/example/unisportbern/R.java