story edit new media changes and style.css change for images in tinyeditor
Merge remote-tracking branch 'origin/master'