Searching (Pre-database)
Branch Peters
Merge branch 'petersPseudo'

Conflicts:
	WheresMyStuff/bin/WheresMyStuff.apk
	WheresMyStuff/bin/classes.dex
	WheresMyStuff/bin/resources.ap_
	WheresMyStuff/src/com/example/wheresmystuff/presenter/WheresMyStuff.java
	WheresMyStuff/src/com/example/wheresmystuff/view/SearchMenuActivity.java