Can now build, view, and place order on the user side.
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster

Conflicts:
	DineOnUserApplication/src/uw/cse/dineon/user/bill/CurrentOrderFragment.java
Fixes login problems with library tests
Added more restaurant activity tests
Merge pull request #205 from glee23/master

Fixed restaurant side library tests & added more restaurant tests
Merge pull request #206 from mrathjen/mMaster

Can now build, view, and place order on the user side.
Merge branch 'master' of https://github.com/blasv/DineOn

Conflicts:
	DineOnRestaurantApplication/tests/src/uw/cse/dineon/library/test/DiningSessionTest.java
	DineOnRestaurantApplication/tests/src/uw/cse/dineon/library/test/RestaurantTest.java