Column name fix for cityzip table
Merge branch 'admin' into dev