cleaned up
Merge branch 'master' of github.com:inverts/Data-Tamers
Merge branch 'master' of github.com:inverts/Data-Tamers
table.js: fixed subtitle display
Merge branch 'master' of github.com:inverts/Data-Tamers
Merge remote-tracking branch 'origin/master' into layoutprototype