Fixed Import Problem in Test
Merge branch 'master' of https://github.com/blasv/DineOn
Merge branch 'master' of https://github.com/blasv/DineOn
Added test for DineOnUserActivty
Merge branch 'master' of https://github.com/blasv/DineOn
Merge pull request #360 from glee23/master

Tweaked restaurant profile dialog text
Merge branch 'master' of https://github.com/blasv/DineOn
Merge pull request #361 from mrathjen/master

Added test for DineOnUserActivty
tested the user sat.
merge
Merge pull request #362 from jordanmcnea22/master

read commit messages
Attempted to fix duplicate menu issue
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev
Merge pull request #364 from mhotan/phase_4_dev

Attempted to fix menu item issue