Merge branch 'master' of https://github.com/mgatare/android-samples

Conflicts:
	Coop/src/com/no/entercard/coopmedlem/HomeScreenActivity.java