Refactoring database
merging
Merge branch 'master' of https://github.com/myhealth/MyEnergyWebServices

Conflicts:
	Database/MyEnergyDatabase/Database.dbmdl
	Database/MyEnergyDatabase/Schema Objects/Schemas/dbo/Tables/food.table.sql