Final Updates
Merge branch 'master' of https://github.com/blasv/DineOn into phase5_development

Conflicts:
	DineOnUserApplication/src/uw/cse/dineon/user/restaurantselection/RestaurantSelectionActivity.java
Merge pull request #393 from mhotan/phase5_development

Final Updates Fuckn ay