Added tests for MainActivity and Login on restaurant side, removed some
unneeded lines from the MainActivity and DSListFrag
Merge pull request #337 from zachr81/master

Commit message
Merge branch 'master' of https://github.com/blasv/DineOn

Conflicts:
	DineOnRestaurantApplication/src/uw/cse/dineon/restaurant/active/DiningSessionListFragment.java
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev