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 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
More profile stuff! Improved layout and bug fixes.
Merge remote-tracking branch 'upstream/master'
Merge pull request #256 from espeo196/master

Read commit messages.
Updated equals in Storable to catch null Object IDs. Update all tests on
User app to pass in Eclipse with expanded coverage
Merge pull request #257 from zachr81/master

Storable equals updated plus lots of test fixes