You can now add and edit columns!
Merge branch 'master' into gh-pages