Updating from upstream and merging
Fixing get_current_language missing from plugin.html
Fixing get_current_language missing from plugin.html
Merged existing work from ItsNotWorking's fork
Merge branch 'develop' into ticket_1916_develop
Update text plugin information
Trailing whitespaces
Mac OSX installation instructions
Fixing installation doc (Brew instead of Macports)...
Adding some more information about virtualenv
Add test when moving plugins in static placeholders
Add test for copy plugins in StaticPlaceholder
Fix dirty bit when moving plugins in placeholders and static placeholders
Add tests with dates to EditModelTemplateTagTest
filters argument in show_editable_model is now resolved to allow use of complex arguments to filters
Add warning to show_editable_model documention to document the use of **mark_safe**. Document that **filters** argument must be a string.
Multilingual sitemap. Base objects switched to Title.
Removed mentions of cms.plugins.text from documentation.
Test for multilingual sitemap. Switch to date-based checks for lastmod to avoid timing skew issues.
Fixed #2220 -- Added location of urls.py