added collection js and form field blocks
fix media browser, no js tabs, just plain links
Merge remote-tracking branch 'origin/master' into 2.3