Fixed problem where checkin dialog doesn't disappear after timeout
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster
Location Services now doesn't fail first time in Selection Screen
Merge pull request #391 from mhotan/phase5_development

Read commits
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster

Conflicts:
	DineOnUserApplication/src/uw/cse/dineon/user/DineOnUserActivity.java
	DineOnUserApplication/src/uw/cse/dineon/user/restaurantselection/RestaurantSelectionActivity.java
add users dining session restaurant
Merge pull request #390 from mrathjen/mMaster

Fixed problem where checkin dialog doesn't disappear after timeout
Added price to user app
Merge pull request #392 from glee23/master

Added price to user app menu items
Merge branch 'master' of https://github.com/blasv/DineOn into phase5_development

Conflicts:
	DineOnUserApplication/src/uw/cse/dineon/user/restaurantselection/RestaurantSelectionActivity.java