re-added old tinymce smileys
Merge branch 'stable'