favorite stuff for restaurant home
Merge branch 'master' of https://github.com/blasv/DineOn
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 pull request #252 from espeo196/master

More user profile stuff.
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
favorites now work.
Merge branch 'master' of https://github.com/blasv/DineOn
Merge pull request #254 from jordanmcnea22/master

favorites button works
Merge remote-tracking branch 'upstream/master'