framework update. Java script tweaks.
Merge branch 'blank-pages-problem'