restore selection after blur using rangy
fixed highlight of icons
Fix merge conflicts for jquery changes
Merge branch 'sa-newwip'