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.
Merge remote-tracking branch 'upstream/master'
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 remote-tracking branch 'upstream/master'

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/util/TestUtility.java