change CMS_MEDIA_ROOT to CMS_MEDIA_URL in cms.utils.conf
Fixed Toolbar Missing buttons #1871
Merge remote-tracking branch 'upstream/develop' into patch_6
Merge pull request #1874 from czpython/patch_6

Fixed buttons not showing in edit page for different languages other than default.
Merge pull request #1869 from evildmp/utils-conf

change CMS_MEDIA_ROOT to CMS_MEDIA_URL in cms.utils.conf
Fixes 1876.
Made changes to templatetag code to always use the placeholders found in template. And if one is not found then create it.
Merge pull request #1877 from czpython/patch-7

Fixes NoReverseMatch on new placeholder
Merge branch 'develop' of git://github.com/divio/django-cms into develop