Merge pull request #343 from glee23/master

Fixed restaurantmainactivitytest
Added some meat to the CurrentBill and Current Order tests and fixed a
bug with incrementing/decrementing. Also did some style fixes.
Merge remote-tracking branch 'upstream/master'
Merge pull request #344 from espeo196/master

Added some meat to the order and bill activity tests. Also fixed some style issues.