Broken TestUtility. DO NOT USE right now.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/RestaurantInfo.java
Merge remote-tracking branch 'upstream/master'
Merge pull request #216 from jordanmcnea22/master

more tests
Updated activities to dismiss alert dialogs
Merge branch 'master' of https://github.com/blasv/DineOn
fixed ant problems
Merge pull request #217 from mhotan/master

Fixes to dialogs
Merge pull request #218 from glee23/master

fixed ant test failures
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/util/TestUtility.java
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnUserApplication/tests/src/uw/cse/dineon/user/bill/test/CurrentOrderActivityTest.java
Merge pull request #219 from espeo196/master

CreateNewAccount test, style fixes, and changes to other tests.
suppressed findbugs failing a build b/c of warnings
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster
Merge pull request #220 from mrathjen/mMaster

suppressed findbugs failing a build b/c of warnings
Tests
Merge branch 'master' of https://github.com/blasv/DineOn