remove bootstrap, add skeljs
update schema
merge
merge
Merge remote-tracking branch 'upstream/master'
remove owners scaffolding and drop db table
remove files
remove columns from tables
misc changes