Match column ordering in upgrade.sh with CreateTables.sql
Merge branch 'column-ordering' into schema-changes-2013-05-15

* column-ordering:
  Match column ordering in upgrade.sh with CreateTables.sql