Merge pull request #1246 from FinalAngel/feature/update-placeholder-docs

Documentation fix for #1071
Merge pull request #1195 from piquadrat/feature/pagefield-tree-order

PageField tree order fix

Thanks to @ojii and @chrisglass for the review!
Welcome our newest two core devs: Daniele Procida and Beni Wohlwend.
Replace AdminSite.root_path by call to reverse (fixes #1214).

This attribute was removed in Django r16575.
Merge branch 'develop' of github.com:divio/django-cms into develop
started a FAQs document
Merge branch 'csrf-once' of https://github.com/mstarinc/django-cms into mstarinc-csrf-once
fixed column width in faqs document
Merge remote-tracking branch 'refs/remotes/andrewschoen/overwriteurlbug' into develop
Added comments and indentation in csrf.js
Merge branch 'develop' of https://github.com/divio/django-cms into develop
Merge branch 'develop' of github.com:divio/django-cms into develop
creating CMS.$ jQuery namespace to prevent conflicts
Merge branch 'develop' of github.com:divio/django-cms into develop
No more ADMIN_MEDIA_PREFIX
Remove ADMIN_MEDIA_PREFIX from test project
Remove ADMIN_MEDIA_PREFIX from docs
Merge branch 'feature/django-1.4-STATIC_URL-support' of https://github.com/KristianOellegaard/django-cms into KristianOellegaard-feature/django-1.4-STATIC_URL-support
Merge branch 'develop' into integration/doc-fixes
Merge branch 'develop' into integration/doc-fixes