Added images and refactored/updated PopulateDatabase.
Added images to Restaurant side
Fixed duplicate UserInfo creation
Merge pull request #382 from espeo196/master

Added more to PopulateDatabase
Merge pull request #383 from glee23/master

Added images to restaurant side
Merge branch 'master' of https://github.com/blasv/DineOn

Conflicts:
	DineOnUserApplication/src/uw/cse/dineon/user/restaurant/home/RestaurantHomeActivity.java
FUCKIN MERGE SHIT
Merge branch 'master' of https://github.com/mhotan/DineOn into phase5_development

Conflicts:
	DineOnUserApplication/src/uw/cse/dineon/user/bill/CurrentOrderFragment.java
Refactored Restaurant stuff to import correct ImageObtainable reference