fixed this broken test
Merge branch 'master' of https://github.com/blasv/DineOn
added/fixed tests
Changed RestaurantInfoFragment to prepopulate address and phone fields
with existing data (matching what the test expected). Updated all tests
except Robotium to match updated features, so they all pass. Removed
most methods that call network features (primarily those which were in
tests which had failures so I found them while fixing tests), and
removed active references to Parse.
Re-did the adapters for the restaurant main activity
Merge pull request #286 from espeo196/master

Changed the location of the request button and added a restaurant hour implementation
Merge pull request #287 from jordanmcnea22/master

Read commit messeges
Merge pull request #288 from zachr81/master

Updated RestaurantInfoFragment and restaurant side tests
Refactored Location stuff to standerd activity
Updates to the info fragment display of restaurant information.
Updates to Restaurant Info Display
Merged, removed parseable code
Updated color scheme in User App
Took out advertisement banner
Removed the chili pepper image
Removed unused reference to table num
Merge pull request #289 from glee23/master

Re-did the adapters for the RestaurantMainActivity
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