Update UPGRADE.md
Merge pull request #133 from askkathir/patch-1

Update UPGRADE.md
Add possibility set text and use builtin tinymce icons in custom buttons
Add overriding of configuration options by passing them to the twig function
Merge pull request #135 from bigfoot90/master

Add possibility set text and use builtin tinymce icons in custom buttons
Update TinyMCE to 4.1.4

Updating vendor tinymce to actual version
Merge pull request #149 from stiig/new-version-tinymce

Update TinyMCE to 4.1.4
Updated jQuery lib
Added locale converter. This resolves #129.
Added asset[] parsing to custom_css

The problem which this Commit refers to is described in
https://github.com/stfalcon/TinymceBundle/issues/110

Problem: It was not possible to use the asset[] method inside a
custom_css path for theming of the tiny-mce editor content.

Fix: The tinymceInit() now parses the config for custom_css for themes
through the getAssetsUrl() function therefore replacing asset[] urls
defined in custom_css of a template to working relative urls
Support multiple assets in custom_css parsing
Fixed documentation regarding custom_css in themes
Merge pull request #150 from Blackskyliner/bugfix/#110

Added asset[] parsing to custom_css
Merge pull request #142 from MisatoTremor/override_config

Overridable configuration on twig level
Merge branch 'master' of https://github.com/stfalcon/TinymceBundle