Renamed primary keys, except userId
Cities updated
Merge branch 'master' of github.com:JGardner81/Restaurant