Implemented action bar search
Slight modification for search
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev

Conflicts:
	DineOnUserApplication/res/values/strings.xml
	DineOnUserApplication/src/uw/cse/dineon/user/DineOnUserActivity.java
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev
Merge pull request #253 from mhotan/phase_4_dev

Search bar in user app