changes b/c of table column name changes
Merge branch 'devtim'
Merge branch 'master' of https://github.com/timbrady/htdocs