searchactivity
Merge branch 'master' of https://github.com/ysugiant/grubber

Conflicts:
	Grubber/src/com/example/grubber/SearchActivity.java