restroring styling for wysuwyg editor
Merge branch 'develop' into forge-3065

Conflicts:
	views/css/tao-main-style.css
	views/css/tao-main-style.css.map
Merge branch 'forge-3065' into develop
regen stylesheets