Changes to support Image abilties
Added second imrpoved layout for restaurant info
Updates to support creating an image and saving it to the cloud.
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev

Conflicts:
	DineOnRestaurantApplication/res/values/strings.xml
	DineOnRestaurantApplication/src/uw/cse/dineon/restaurant/DineOnRestaurantActivity.java
Updated strings and menu
Made changes to Image IO and menu progress bar
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev

Conflicts:
	DineOnRestaurantApplication/res/values/strings.xml
	DineOnRestaurantApplication/src/uw/cse/dineon/restaurant/login/CreateNewRestaurantAccountActivity.java
Adjust image caching to only use parse dates and not our dates
Got Images partially working.  It is just extremely slow I am querying
for a image from the database and that is still taking to long
Orders now use CurrentOrderItems and not MenuItems.
Merge branch 'master' of https://github.com/blasv/DineOn into mMaster
Add support for emulator with location services.
Merge pull request #248 from mrathjen/mMaster

Orders now use CurrentOrderItems and not MenuItems.
Merge pull request #247 from mhotan/phase_4_dev

Images partially working
More User Profile editing.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DineOnLibrary/src/uw/cse/dineon/library/image/ImageIO.java
Don't get location if running restaurant on emulator.
Merge pull request #249 from mrathjen/mMaster

Don't get location if running restaurant on emulator.
Merge remote-tracking branch 'upstream/master'
User Profile finished. Email, phone, and password changing functionality
implemented.