added search
Merge branch 'master' of https://github.com/StephieL/MobileApp

Conflicts:
	BadeseenBerlin/bin/BadeseenBerlin.apk
	BadeseenBerlin/bin/R.txt
	BadeseenBerlin/bin/classes.dex
	BadeseenBerlin/bin/classes/android/support/v7/appcompat/R$bool.class
	BadeseenBerlin/bin/classes/android/support/v7/appcompat/R$color.class
	BadeseenBerlin/bin/classes/android/support/v7/appcompat/R$dimen.class
	BadeseenBerlin/bin/classes/android/support/v7/appcompat/R$id.class
	BadeseenBerlin/bin/classes/android/support/v7/appcompat/R$integer.class
	BadeseenBerlin/bin/classes/android/support/v7/appcompat/R$string.class
	BadeseenBerlin/bin/classes/com/example/badeseenberlin/MainActivity.class
	BadeseenBerlin/bin/classes/com/example/badeseenberlin/R$bool.class
	BadeseenBerlin/bin/classes/com/example/badeseenberlin/R$color.class
	BadeseenBerlin/bin/classes/com/example/badeseenberlin/R$dimen.class
	BadeseenBerlin/bin/classes/com/example/badeseenberlin/R$drawable.class
	BadeseenBerlin/bin/classes/com/example/badeseenberlin/R$id.class
	BadeseenBerlin/bin/classes/com/example/badeseenberlin/R$integer.class
	BadeseenBerlin/bin/classes/com/example/badeseenberlin/R$layout.class
	BadeseenBerlin/bin/classes/com/example/badeseenberlin/R$menu.class
	BadeseenBerlin/bin/classes/com/example/badeseenberlin/R$string.class
	BadeseenBerlin/bin/classes/com/example/badeseenberlin/R$style.class
	BadeseenBerlin/bin/classes/com/example/badeseenberlin/R$styleable.class
	BadeseenBerlin/bin/classes/com/google/android/gms/R$color.class
	BadeseenBerlin/bin/classes/com/google/android/gms/R$id.class
	BadeseenBerlin/bin/classes/com/google/android/gms/R$integer.class
	BadeseenBerlin/bin/classes/com/google/android/gms/R$string.class
	BadeseenBerlin/bin/resources.ap_
	BadeseenBerlin/gen/android/support/v7/appcompat/R.java
	BadeseenBerlin/gen/com/example/badeseenberlin/R.java
	BadeseenBerlin/gen/com/google/android/gms/R.java
	BadeseenBerlin/res/layout/gradient_green.xml
	BadeseenBerlin/res/values/strings.xml
	BadeseenBerlin/src/com/example/badeseenberlin/AppActivity.java
merge bugs fixed