Customer Request test
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnUserApplication/tests/src/uw/cse/dineon/user/bill/test/CurrentOrderActivityTest.java
	DineOnUserApplication/tests/src/uw/cse/dineon/user/restaurant/home/test/RestaurantHomeActivityTest.java
Style fixes and Customer Request Test.
Merge pull request #197 from espeo196/master

Style fixes and Customer Request test.
Merge branch 'master' of https://github.com/blasv/DineOn