Refactored Location stuff to standerd activity
Updates to the info fragment display of restaurant information.
Updates to Restaurant Info Display
Added Robotium walkthrough
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/RestaurantInfo.java
	DineOnRestaurantApplication/res/layout/fragment_restaurant_info_two.xml
	DineOnRestaurantApplication/res/values/strings.xml
	DineOnRestaurantApplication/src/uw/cse/dineon/restaurant/profile/RestaurantInfoFragment.java
	DineOnUserApplication/src/uw/cse/dineon/user/restaurant/home/RestaurantInfoFragment.java
	DineOnUserApplication/src/uw/cse/dineon/user/restaurantselection/RestaurantListFragment.java
Updated Restaurant Info after merge
Updates to Data representation types
Updated Restaurant Info fragment to use current location as location of
restaurant.
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev

Conflicts:
	DineOnRestaurantApplication/res/values/strings.xml
Merge pull request #292 from mhotan/phase_4_dev

Updates to Restaurant Info
A few test. Some dead code deletions and update to test util
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster
Added test content to login, create, and profile tests.
Merge pull request #294 from mrathjen/mMaster

 	A few test. Some dead code deletions and update to test util
Merge branch 'master' of https://github.com/blasv/DineOn
Merge pull request #295 from jordanmcnea22/master

Read commit messeges
Library tests with comments + asserts + no warnings
Added assertions to check that RestaurantActivity methods work properly
Merge pull request #298 from zachr81/master

Library test and some restaurant tests