Migrate and reannotate
remove old query
fix dependency issues in js file loading
Other annotations from migration
Merge branch 'master' of github.com:criticaljuncture/fr2