CRAFTERCMS-294: Switching back to WYSIWIG mode removes <br> tags
CRAFTERCMS-385: authoring search results icon CSS is messed up
Merge remote-tracking branch 'david/master'