configuration docs mainly
amended inherit template option text in English
contribution guide amended
Changed name of magic mptt-repair to fix-mptt
Merge pull request #1866 from motiteux/patch-1

Changed name of magic mptt-repair to fix-mptt
fixed silly typo
rewrite to work around annoying literal limitation in sphinx
Merge pull request #1853 from evildmp/docs3

Configuration docs and more
change CMS_MEDIA_ROOT to CMS_MEDIA_URL in cms.utils.conf
Update tutorial.rst
Merge pull request #1872 from nephila/develop

Update tutorial.rst
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 remote-tracking branch 'upstream/develop' into develop
say 'pip and virtualenv' instead of just pip