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
Merge pull request #206 from mrathjen/mMaster

Can now build, view, and place order on the user side.