fixed column names and prepping for db dump
Merge branch 'dev'