add shopview activity
Merge branch 'master' of github.com:openpizza/openpizza-android

Conflicts:
	src/de/openpizza/android/views/Shop.java