Merge branch '2.0'
Fix @import insertion JS
Version the app, invalidate old sessions