Changed some field names
Merge branch 'master' of https://github.com/isaaclimdc/EatUpServer
Changed some field names
Changed some field names
Changed some field names
Changed some field names
Changed some field names