Merge branch 'master' of https://github.com/blasv/DineOn
Merge branch 'master' of https://github.com/blasv/DineOn
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.
tests
Merge branch 'master' of https://github.com/blasv/DineOn
Merge branch 'master' of https://github.com/jordanmcnea22/DineOn into test
Merge pull request #207 from jordanmcnea22/master

Read commit messeges
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
Merge branch 'master' of https://github.com/blasv/DineOn
Updated test to attempt to sign up then login
Added tests and documentation to restaurant login and create accounts
Merge pull request #208 from glee23/master

Added tests and documentation to restaurant login and create accounts
Merge pull request #209 from mhotan/master

More test
Merge branch 'master' of https://github.com/mhotan/DineOn into mh_beta_devel

Conflicts:
	DineOnRestaurantApplication/tests/src/uw/cse/dineon/restaurant/test/CreateRestaurantAccountTest.java
Updated some documentation and fixed some sign up things