Changes 3.2.0:

new welcome page to help new users
touch-screen support for most editing interfaces, for sizes from small tablets to table-top devices
enhanced and polished user interface
much-needed improvements to the structure-board
enhancements to components such as the pop-up plugin editor, sideframe (now called the overlay) and the toolbar
significant speed improvements on loading, HTTP requests and file sizes
restarts are no longer required when changing apphook configurations
a new content wizard system, adaptable to arbitrary content types

3 files changed, 332 insertions, 210 deletions

diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile
index 0e1c8fbac40..7da35e91320 100644
--- a/www/py-django-cms/Makefile
+++ b/www/py-django-cms/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2015/09/08 08:16:24 adam Exp $
+# $NetBSD: Makefile,v 1.34 2015/11/24 17:33:01 adam Exp $
 
-DISTNAME=	django-cms-3.1.3
+DISTNAME=	django-cms-3.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
 MASTER_SITES=	http://pypi.python.org/packages/source/d/django-cms/
@@ -12,7 +12,6 @@ LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
 DEPENDS+=	${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
-#DEPENDS+=	${PYPKGPREFIX}-django-south-[0-9]*:../../www/py-django-south
 DEPENDS+=	${PYPKGPREFIX}-django-classy-tags-[0-9]*:../../www/py-django-classy-tags
 DEPENDS+=	${PYPKGPREFIX}-django-mptt-[0-9]*:../../www/py-django-mptt
 DEPENDS+=	${PYPKGPREFIX}-django-sekizai-[0-9]*:../../www/py-django-sekizai
diff --git a/www/py-django-cms/PLIST b/www/py-django-cms/PLIST
index 30d9c670707..ae6973bd832 100644
--- a/www/py-django-cms/PLIST
+++ b/www/py-django-cms/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2015/09/08 08:16:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.23 2015/11/24 17:33:01 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -77,12 +77,18 @@ ${PYSITELIB}/cms/cache/permissions.pyo
 ${PYSITELIB}/cms/cache/placeholder.py
 ${PYSITELIB}/cms/cache/placeholder.pyc
 ${PYSITELIB}/cms/cache/placeholder.pyo
+${PYSITELIB}/cms/cms_menus.py
+${PYSITELIB}/cms/cms_menus.pyc
+${PYSITELIB}/cms/cms_menus.pyo
 ${PYSITELIB}/cms/cms_plugins.py
 ${PYSITELIB}/cms/cms_plugins.pyc
 ${PYSITELIB}/cms/cms_plugins.pyo
-${PYSITELIB}/cms/cms_toolbar.py
-${PYSITELIB}/cms/cms_toolbar.pyc
-${PYSITELIB}/cms/cms_toolbar.pyo
+${PYSITELIB}/cms/cms_toolbars.py
+${PYSITELIB}/cms/cms_toolbars.pyc
+${PYSITELIB}/cms/cms_toolbars.pyo
+${PYSITELIB}/cms/cms_wizards.py
+${PYSITELIB}/cms/cms_wizards.pyc
+${PYSITELIB}/cms/cms_wizards.pyo
 ${PYSITELIB}/cms/constants.py
 ${PYSITELIB}/cms/constants.pyc
 ${PYSITELIB}/cms/constants.pyo
@@ -119,6 +125,9 @@ ${PYSITELIB}/cms/forms/utils.pyo
 ${PYSITELIB}/cms/forms/widgets.py
 ${PYSITELIB}/cms/forms/widgets.pyc
 ${PYSITELIB}/cms/forms/widgets.pyo
+${PYSITELIB}/cms/forms/wizards.py
+${PYSITELIB}/cms/forms/wizards.pyc
+${PYSITELIB}/cms/forms/wizards.pyo
 ${PYSITELIB}/cms/locale/af/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/af/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/af/LC_MESSAGES/djangojs.mo
@@ -147,6 +156,10 @@ ${PYSITELIB}/cms/locale/cmn/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/cmn/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/cmn/LC_MESSAGES/djangojs.mo
 ${PYSITELIB}/cms/locale/cmn/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/cs/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/cs/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/cs/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/cs/LC_MESSAGES/djangojs.po
 ${PYSITELIB}/cms/locale/cy/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/cy/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/cy/LC_MESSAGES/djangojs.mo
@@ -311,14 +324,14 @@ ${PYSITELIB}/cms/locale/nl/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/nl/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/nl/LC_MESSAGES/djangojs.mo
 ${PYSITELIB}/cms/locale/nl/LC_MESSAGES/djangojs.po
-${PYSITELIB}/cms/locale/nl_NL/LC_MESSAGES/django.mo
-${PYSITELIB}/cms/locale/nl_NL/LC_MESSAGES/django.po
-${PYSITELIB}/cms/locale/nl_NL/LC_MESSAGES/djangojs.mo
-${PYSITELIB}/cms/locale/nl_NL/LC_MESSAGES/djangojs.po
 ${PYSITELIB}/cms/locale/no/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/no/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/no/LC_MESSAGES/djangojs.mo
 ${PYSITELIB}/cms/locale/no/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/pap/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/pap/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/pap/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/pap/LC_MESSAGES/djangojs.po
 ${PYSITELIB}/cms/locale/pl/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/pl/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/pl/LC_MESSAGES/djangojs.mo
@@ -481,9 +494,6 @@ ${PYSITELIB}/cms/management/commands/subcommands/tree.pyo
 ${PYSITELIB}/cms/management/commands/subcommands/uninstall.py
 ${PYSITELIB}/cms/management/commands/subcommands/uninstall.pyc
 ${PYSITELIB}/cms/management/commands/subcommands/uninstall.pyo
-${PYSITELIB}/cms/menu.py
-${PYSITELIB}/cms/menu.pyc
-${PYSITELIB}/cms/menu.pyo
 ${PYSITELIB}/cms/menu_bases.py
 ${PYSITELIB}/cms/menu_bases.pyc
 ${PYSITELIB}/cms/menu_bases.pyo
@@ -502,6 +512,9 @@ ${PYSITELIB}/cms/middleware/toolbar.pyo
 ${PYSITELIB}/cms/middleware/user.py
 ${PYSITELIB}/cms/middleware/user.pyc
 ${PYSITELIB}/cms/middleware/user.pyo
+${PYSITELIB}/cms/middleware/utils.py
+${PYSITELIB}/cms/middleware/utils.pyc
+${PYSITELIB}/cms/middleware/utils.pyo
 ${PYSITELIB}/cms/migrations/0001_initial.py
 ${PYSITELIB}/cms/migrations/0001_initial.pyc
 ${PYSITELIB}/cms/migrations/0001_initial.pyo
@@ -541,6 +554,9 @@ ${PYSITELIB}/cms/migrations/0011_auto_20150419_1006.pyo
 ${PYSITELIB}/cms/migrations/0012_auto_20150607_2207.py
 ${PYSITELIB}/cms/migrations/0012_auto_20150607_2207.pyc
 ${PYSITELIB}/cms/migrations/0012_auto_20150607_2207.pyo
+${PYSITELIB}/cms/migrations/0013_urlconfrevision.py
+${PYSITELIB}/cms/migrations/0013_urlconfrevision.pyc
+${PYSITELIB}/cms/migrations/0013_urlconfrevision.pyo
 ${PYSITELIB}/cms/migrations/__init__.py
 ${PYSITELIB}/cms/migrations/__init__.pyc
 ${PYSITELIB}/cms/migrations/__init__.pyo
@@ -550,6 +566,9 @@ ${PYSITELIB}/cms/models/__init__.pyo
 ${PYSITELIB}/cms/models/aliaspluginmodel.py
 ${PYSITELIB}/cms/models/aliaspluginmodel.pyc
 ${PYSITELIB}/cms/models/aliaspluginmodel.pyo
+${PYSITELIB}/cms/models/apphooks_reload.py
+${PYSITELIB}/cms/models/apphooks_reload.pyc
+${PYSITELIB}/cms/models/apphooks_reload.pyo
 ${PYSITELIB}/cms/models/fields.py
 ${PYSITELIB}/cms/models/fields.pyc
 ${PYSITELIB}/cms/models/fields.pyo
@@ -586,6 +605,9 @@ ${PYSITELIB}/cms/models/static_placeholder.pyo
 ${PYSITELIB}/cms/models/titlemodels.py
 ${PYSITELIB}/cms/models/titlemodels.pyc
 ${PYSITELIB}/cms/models/titlemodels.pyo
+${PYSITELIB}/cms/page_rendering.py
+${PYSITELIB}/cms/page_rendering.pyc
+${PYSITELIB}/cms/page_rendering.pyo
 ${PYSITELIB}/cms/plugin_base.py
 ${PYSITELIB}/cms/plugin_base.pyc
 ${PYSITELIB}/cms/plugin_base.pyo
@@ -880,15 +902,45 @@ ${PYSITELIB}/cms/south_migrations/0076_auto__chg_field_page_created_by__chg_fiel
 ${PYSITELIB}/cms/south_migrations/0077_auto__chg_field_usersettings_user.py
 ${PYSITELIB}/cms/south_migrations/0077_auto__chg_field_usersettings_user.pyc
 ${PYSITELIB}/cms/south_migrations/0077_auto__chg_field_usersettings_user.pyo
+${PYSITELIB}/cms/south_migrations/0078_auto__add_urlconfrevision.py
+${PYSITELIB}/cms/south_migrations/0078_auto__add_urlconfrevision.pyc
+${PYSITELIB}/cms/south_migrations/0078_auto__add_urlconfrevision.pyo
 ${PYSITELIB}/cms/south_migrations/__init__.py
 ${PYSITELIB}/cms/south_migrations/__init__.pyc
 ${PYSITELIB}/cms/south_migrations/__init__.pyo
-${PYSITELIB}/cms/static/cms/.sass-cache/pio
-${PYSITELIB}/cms/static/cms/config.rb
 ${PYSITELIB}/cms/static/cms/css/cms.base.css
 ${PYSITELIB}/cms/static/cms/css/cms.pagetree.css
-${PYSITELIB}/cms/static/cms/css/cms.toolbar.modal.css
-${PYSITELIB}/cms/static/cms/css/cms.toolbar.sideframe.css
+${PYSITELIB}/cms/static/cms/css/cms.welcome.css
+${PYSITELIB}/cms/static/cms/css/cms.wizard.css
+${PYSITELIB}/cms/static/cms/fonts/django-cms-iconfont.eot
+${PYSITELIB}/cms/static/cms/fonts/django-cms-iconfont.svg
+${PYSITELIB}/cms/static/cms/fonts/django-cms-iconfont.ttf
+${PYSITELIB}/cms/static/cms/fonts/django-cms-iconfont.woff
+${PYSITELIB}/cms/static/cms/fonts/django-cms-iconfont.woff2
+${PYSITELIB}/cms/static/cms/fonts/src/_template.svgz
+${PYSITELIB}/cms/static/cms/fonts/src/alias.svg
+${PYSITELIB}/cms/static/cms/fonts/src/arrow-right.svg
+${PYSITELIB}/cms/static/cms/fonts/src/arrow-wide.svg
+${PYSITELIB}/cms/static/cms/fonts/src/arrow.svg
+${PYSITELIB}/cms/static/cms/fonts/src/bin.svg
+${PYSITELIB}/cms/static/cms/fonts/src/check.svg
+${PYSITELIB}/cms/static/cms/fonts/src/close.svg
+${PYSITELIB}/cms/static/cms/fonts/src/copy.svg
+${PYSITELIB}/cms/static/cms/fonts/src/handler.svg
+${PYSITELIB}/cms/static/cms/fonts/src/home.svg
+${PYSITELIB}/cms/static/cms/fonts/src/loader.svg
+${PYSITELIB}/cms/static/cms/fonts/src/lock.svg
+${PYSITELIB}/cms/static/cms/fonts/src/logo.svg
+${PYSITELIB}/cms/static/cms/fonts/src/menu.svg
+${PYSITELIB}/cms/static/cms/fonts/src/minimize.svg
+${PYSITELIB}/cms/static/cms/fonts/src/minus.svg
+${PYSITELIB}/cms/static/cms/fonts/src/paste.svg
+${PYSITELIB}/cms/static/cms/fonts/src/pencil.svg
+${PYSITELIB}/cms/static/cms/fonts/src/pin.svg
+${PYSITELIB}/cms/static/cms/fonts/src/plus.svg
+${PYSITELIB}/cms/static/cms/fonts/src/scissors.svg
+${PYSITELIB}/cms/static/cms/fonts/src/search.svg
+${PYSITELIB}/cms/static/cms/fonts/src/window.svg
 ${PYSITELIB}/cms/static/cms/img/icons/filetypes/flv.gif
 ${PYSITELIB}/cms/static/cms/img/icons/filetypes/gif.gif
 ${PYSITELIB}/cms/static/cms/img/icons/filetypes/html.gif
@@ -914,17 +966,20 @@ ${PYSITELIB}/cms/static/cms/img/icons/plugins/link.png
 ${PYSITELIB}/cms/static/cms/img/icons/plugins/snippet.png
 ${PYSITELIB}/cms/static/cms/img/loader.gif
 ${PYSITELIB}/cms/static/cms/img/loader@2x.gif
-${PYSITELIB}/cms/static/cms/img/logo-white.png
-${PYSITELIB}/cms/static/cms/img/logo-white@2x.png
+${PYSITELIB}/cms/static/cms/img/pagetree/icon-no.gif
+${PYSITELIB}/cms/static/cms/img/pagetree/icon-yes.gif
+${PYSITELIB}/cms/static/cms/img/pagetree/publish.png
 ${PYSITELIB}/cms/static/cms/img/pagetree/sprite.png
 ${PYSITELIB}/cms/static/cms/img/pagetree/tree-li-drag.gif
-${PYSITELIB}/cms/static/cms/img/toolbar/pattern.png
+${PYSITELIB}/cms/static/cms/img/pagetree/unpublish.png
 ${PYSITELIB}/cms/static/cms/img/toolbar/render_model_add.png
 ${PYSITELIB}/cms/static/cms/img/toolbar/render_model_icon.png
 ${PYSITELIB}/cms/static/cms/img/toolbar/render_model_placeholder.png
-${PYSITELIB}/cms/static/cms/img/toolbar/sprite_toolbar.png
-${PYSITELIB}/cms/static/cms/img/toolbar/sprite_toolbar@2x.png
-${PYSITELIB}/cms/static/cms/img/welcome-bg.png
+${PYSITELIB}/cms/static/cms/js/.DS_Store
+${PYSITELIB}/cms/static/cms/js/dist/bundle.admin.base.min.js
+${PYSITELIB}/cms/static/cms/js/dist/bundle.admin.changeform.min.js
+${PYSITELIB}/cms/static/cms/js/dist/bundle.admin.changelist.min.js
+${PYSITELIB}/cms/static/cms/js/dist/bundle.toolbar.min.js
 ${PYSITELIB}/cms/static/cms/js/jstree/_lib/_all.js
 ${PYSITELIB}/cms/static/cms/js/jstree/_lib/css.js
 ${PYSITELIB}/cms/static/cms/js/jstree/_lib/jquery.cookie.js
@@ -948,8 +1003,10 @@ ${PYSITELIB}/cms/static/cms/js/jstree/themes/default/create.png
 ${PYSITELIB}/cms/static/cms/js/jstree/themes/default/dot.gif
 ${PYSITELIB}/cms/static/cms/js/jstree/themes/default/f.png
 ${PYSITELIB}/cms/static/cms/js/jstree/themes/default/fminus.gif
+${PYSITELIB}/cms/static/cms/js/jstree/themes/default/fminus2.gif
 ${PYSITELIB}/cms/static/cms/js/jstree/themes/default/fminus_rtl.gif
 ${PYSITELIB}/cms/static/cms/js/jstree/themes/default/fplus.gif
+${PYSITELIB}/cms/static/cms/js/jstree/themes/default/fplus2.gif
 ${PYSITELIB}/cms/static/cms/js/jstree/themes/default/fplus_rtl.gif
 ${PYSITELIB}/cms/static/cms/js/jstree/themes/default/lastli.gif
 ${PYSITELIB}/cms/static/cms/js/jstree/themes/default/lastli_rtl.gif
@@ -966,19 +1023,27 @@ ${PYSITELIB}/cms/static/cms/js/jstree/tree_component.css
 ${PYSITELIB}/cms/static/cms/js/jstree/tree_component.js
 ${PYSITELIB}/cms/static/cms/js/libs/class.min.js
 ${PYSITELIB}/cms/static/cms/js/libs/jquery.min.js
+${PYSITELIB}/cms/static/cms/js/libs/pep.js
 ${PYSITELIB}/cms/static/cms/js/libs/swfobject.min.js
-${PYSITELIB}/cms/static/cms/js/modules/cms.app_hook_select.js
 ${PYSITELIB}/cms/static/cms/js/modules/cms.base.js
 ${PYSITELIB}/cms/static/cms/js/modules/cms.changeform.js
 ${PYSITELIB}/cms/static/cms/js/modules/cms.changelist.js
 ${PYSITELIB}/cms/static/cms/js/modules/cms.clipboard.js
+${PYSITELIB}/cms/static/cms/js/modules/cms.messages.js
 ${PYSITELIB}/cms/static/cms/js/modules/cms.modal.js
+${PYSITELIB}/cms/static/cms/js/modules/cms.navigation.js
 ${PYSITELIB}/cms/static/cms/js/modules/cms.plugins.js
 ${PYSITELIB}/cms/static/cms/js/modules/cms.sideframe.js
 ${PYSITELIB}/cms/static/cms/js/modules/cms.structureboard.js
 ${PYSITELIB}/cms/static/cms/js/modules/cms.toolbar.js
+${PYSITELIB}/cms/static/cms/js/modules/cms.tooltip.js
+${PYSITELIB}/cms/static/cms/js/modules/cms.wizards.js
+${PYSITELIB}/cms/static/cms/js/modules/jquery.noconflict.post.js
+${PYSITELIB}/cms/static/cms/js/modules/jquery.noconflict.pre.js
+${PYSITELIB}/cms/static/cms/js/modules/jquery.transition.js
 ${PYSITELIB}/cms/static/cms/js/modules/jquery.ui.custom.js
 ${PYSITELIB}/cms/static/cms/js/modules/jquery.ui.nestedsortable.js
+${PYSITELIB}/cms/static/cms/js/modules/jquery.ui.touchpunch.js
 ${PYSITELIB}/cms/static/cms/js/select2/LICENSE
 ${PYSITELIB}/cms/static/cms/js/select2/README.md
 ${PYSITELIB}/cms/static/cms/js/select2/select2-bootstrap.css
@@ -1033,20 +1098,40 @@ ${PYSITELIB}/cms/static/cms/js/select2/select2_locale_vi.js
 ${PYSITELIB}/cms/static/cms/js/select2/select2_locale_zh-CN.js
 ${PYSITELIB}/cms/static/cms/js/select2/select2_locale_zh-TW.js
 ${PYSITELIB}/cms/static/cms/js/select2/select2x2.png
+${PYSITELIB}/cms/static/cms/js/widgets/forms.apphookselect.js
+${PYSITELIB}/cms/static/cms/js/widgets/forms.pageselectwidget.js
+${PYSITELIB}/cms/static/cms/js/widgets/forms.pagesmartlinkwidget.js
+${PYSITELIB}/cms/static/cms/js/widgets/wizard.pagetypeselect.js
 ${PYSITELIB}/cms/static/cms/sass/cms.base.scss
 ${PYSITELIB}/cms/static/cms/sass/cms.pagetree.scss
-${PYSITELIB}/cms/static/cms/sass/cms.toolbar.modal.scss
-${PYSITELIB}/cms/static/cms/sass/cms.toolbar.sideframe.scss
-${PYSITELIB}/cms/static/cms/sass/includes/_clipboard.scss
-${PYSITELIB}/cms/static/cms/sass/includes/_common.scss
-${PYSITELIB}/cms/static/cms/sass/includes/_content.scss
-${PYSITELIB}/cms/static/cms/sass/includes/_modal.scss
-${PYSITELIB}/cms/static/cms/sass/includes/_retina.scss
-${PYSITELIB}/cms/static/cms/sass/includes/_sideframe.scss
-${PYSITELIB}/cms/static/cms/sass/includes/_structureboard.scss
-${PYSITELIB}/cms/static/cms/sass/includes/_subnav.scss
-${PYSITELIB}/cms/static/cms/sass/includes/_toolbar.scss
-${PYSITELIB}/cms/static/cms/sass/settings/_default.scss
+${PYSITELIB}/cms/static/cms/sass/cms.welcome.scss
+${PYSITELIB}/cms/static/cms/sass/cms.wizard.scss
+${PYSITELIB}/cms/static/cms/sass/components/_animation.scss
+${PYSITELIB}/cms/static/cms/sass/components/_button.scss
+${PYSITELIB}/cms/static/cms/sass/components/_clipboard.scss
+${PYSITELIB}/cms/static/cms/sass/components/_content.scss
+${PYSITELIB}/cms/static/cms/sass/components/_dialog.scss
+${PYSITELIB}/cms/static/cms/sass/components/_general.scss
+${PYSITELIB}/cms/static/cms/sass/components/_hovertooltip.scss
+${PYSITELIB}/cms/static/cms/sass/components/_iconography.scss
+${PYSITELIB}/cms/static/cms/sass/components/_loader.scss
+${PYSITELIB}/cms/static/cms/sass/components/_modal.scss
+${PYSITELIB}/cms/static/cms/sass/components/_pluginpicker.scss
+${PYSITELIB}/cms/static/cms/sass/components/_reset.scss
+${PYSITELIB}/cms/static/cms/sass/components/_sideframe.scss
+${PYSITELIB}/cms/static/cms/sass/components/_structureboard.scss
+${PYSITELIB}/cms/static/cms/sass/components/_subnav.scss
+${PYSITELIB}/cms/static/cms/sass/components/_toolbar.scss
+${PYSITELIB}/cms/static/cms/sass/components/_tooltip.scss
+${PYSITELIB}/cms/static/cms/sass/components/_welcome.scss
+${PYSITELIB}/cms/static/cms/sass/libs/_iconfont.scss
+${PYSITELIB}/cms/static/cms/sass/mixins/_all.scss
+${PYSITELIB}/cms/static/cms/sass/mixins/_buttons.scss
+${PYSITELIB}/cms/static/cms/sass/mixins/_custom.scss
+${PYSITELIB}/cms/static/cms/sass/mixins/_retina.scss
+${PYSITELIB}/cms/static/cms/sass/mixins/_zindex.scss
+${PYSITELIB}/cms/static/cms/sass/settings/_all.scss
+${PYSITELIB}/cms/static/cms/sass/settings/_cms.scss
 ${PYSITELIB}/cms/static/cms/swf/expressInstall.swf
 ${PYSITELIB}/cms/static/cms/swf/player.swf
 ${PYSITELIB}/cms/templates/admin/cms/extensions/change_form.html
@@ -1103,6 +1188,11 @@ ${PYSITELIB}/cms/templates/cms/toolbar/render_plugin_block.html
 ${PYSITELIB}/cms/templates/cms/toolbar/toolbar.html
 ${PYSITELIB}/cms/templates/cms/toolbar/toolbar_javascript.html
 ${PYSITELIB}/cms/templates/cms/welcome.html
+${PYSITELIB}/cms/templates/cms/wizards/base.html
+${PYSITELIB}/cms/templates/cms/wizards/create.html
+${PYSITELIB}/cms/templates/cms/wizards/done.html
+${PYSITELIB}/cms/templates/cms/wizards/includes/form_fields.html
+${PYSITELIB}/cms/templates/cms/wizards/start.html
 ${PYSITELIB}/cms/templatetags/__init__.py
 ${PYSITELIB}/cms/templatetags/__init__.pyc
 ${PYSITELIB}/cms/templatetags/__init__.pyo
@@ -1115,6 +1205,9 @@ ${PYSITELIB}/cms/templatetags/cms_js_tags.pyo
 ${PYSITELIB}/cms/templatetags/cms_tags.py
 ${PYSITELIB}/cms/templatetags/cms_tags.pyc
 ${PYSITELIB}/cms/templatetags/cms_tags.pyo
+${PYSITELIB}/cms/templatetags/cms_wizard_tags.py
+${PYSITELIB}/cms/templatetags/cms_wizard_tags.pyc
+${PYSITELIB}/cms/templatetags/cms_wizard_tags.pyo
 ${PYSITELIB}/cms/test_utils/__init__.py
 ${PYSITELIB}/cms/test_utils/__init__.pyc
 ${PYSITELIB}/cms/test_utils/__init__.pyo
@@ -1229,9 +1322,9 @@ ${PYSITELIB}/cms/test_utils/project/extensionapp/__init__.pyo
 ${PYSITELIB}/cms/test_utils/project/extensionapp/admin.py
 ${PYSITELIB}/cms/test_utils/project/extensionapp/admin.pyc
 ${PYSITELIB}/cms/test_utils/project/extensionapp/admin.pyo
-${PYSITELIB}/cms/test_utils/project/extensionapp/cms_toolbar.py
-${PYSITELIB}/cms/test_utils/project/extensionapp/cms_toolbar.pyc
-${PYSITELIB}/cms/test_utils/project/extensionapp/cms_toolbar.pyo
+${PYSITELIB}/cms/test_utils/project/extensionapp/cms_toolbars.py
+${PYSITELIB}/cms/test_utils/project/extensionapp/cms_toolbars.pyc
+${PYSITELIB}/cms/test_utils/project/extensionapp/cms_toolbars.pyo
 ${PYSITELIB}/cms/test_utils/project/extensionapp/migrations/0001_initial.py
 ${PYSITELIB}/cms/test_utils/project/extensionapp/migrations/0001_initial.pyc
 ${PYSITELIB}/cms/test_utils/project/extensionapp/migrations/0001_initial.pyo
@@ -1346,15 +1439,15 @@ ${PYSITELIB}/cms/test_utils/project/placeholderapp/__init__.pyo
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/admin.py
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/admin.pyc
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/admin.pyo
-${PYSITELIB}/cms/test_utils/project/placeholderapp/cms_app.py
-${PYSITELIB}/cms/test_utils/project/placeholderapp/cms_app.pyc
-${PYSITELIB}/cms/test_utils/project/placeholderapp/cms_app.pyo
+${PYSITELIB}/cms/test_utils/project/placeholderapp/cms_apps.py
+${PYSITELIB}/cms/test_utils/project/placeholderapp/cms_apps.pyc
+${PYSITELIB}/cms/test_utils/project/placeholderapp/cms_apps.pyo
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/cms_plugins.py
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/cms_plugins.pyc
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/cms_plugins.pyo
-${PYSITELIB}/cms/test_utils/project/placeholderapp/cms_toolbar.py
-${PYSITELIB}/cms/test_utils/project/placeholderapp/cms_toolbar.pyc
-${PYSITELIB}/cms/test_utils/project/placeholderapp/cms_toolbar.pyo
+${PYSITELIB}/cms/test_utils/project/placeholderapp/cms_toolbars.py
+${PYSITELIB}/cms/test_utils/project/placeholderapp/cms_toolbars.pyc
+${PYSITELIB}/cms/test_utils/project/placeholderapp/cms_toolbars.pyo
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/migrations/0001_initial.py
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/migrations/0001_initial.pyc
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/migrations/0001_initial.pyo
@@ -1370,12 +1463,6 @@ ${PYSITELIB}/cms/test_utils/project/placeholderapp/migrations/0004_auto_20150503
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/migrations/0005_example1_decimal_field.py
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/migrations/0005_example1_decimal_field.pyc
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/migrations/0005_example1_decimal_field.pyo
-${PYSITELIB}/cms/test_utils/project/placeholderapp/migrations_django/0005_example1_decimal_field.py
-${PYSITELIB}/cms/test_utils/project/placeholderapp/migrations_django/0005_example1_decimal_field.pyc
-${PYSITELIB}/cms/test_utils/project/placeholderapp/migrations_django/0005_example1_decimal_field.pyo
-${PYSITELIB}/cms/test_utils/project/placeholderapp/south_migrations/0003_auto__add_field_example1_decimal_field.py
-${PYSITELIB}/cms/test_utils/project/placeholderapp/south_migrations/0003_auto__add_field_example1_decimal_field.pyc
-${PYSITELIB}/cms/test_utils/project/placeholderapp/south_migrations/0003_auto__add_field_example1_decimal_field.pyo
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/migrations/__init__.py
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/migrations/__init__.pyc
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/migrations/__init__.pyo
@@ -1388,6 +1475,9 @@ ${PYSITELIB}/cms/test_utils/project/placeholderapp/south_migrations/0001_initial
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/south_migrations/0002_auto__add_field_example1_publish.py
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/south_migrations/0002_auto__add_field_example1_publish.pyc
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/south_migrations/0002_auto__add_field_example1_publish.pyo
+${PYSITELIB}/cms/test_utils/project/placeholderapp/south_migrations/0003_auto__add_field_example1_decimal_field.py
+${PYSITELIB}/cms/test_utils/project/placeholderapp/south_migrations/0003_auto__add_field_example1_decimal_field.pyc
+${PYSITELIB}/cms/test_utils/project/placeholderapp/south_migrations/0003_auto__add_field_example1_decimal_field.pyo
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/south_migrations/__init__.py
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/south_migrations/__init__.pyc
 ${PYSITELIB}/cms/test_utils/project/placeholderapp/south_migrations/__init__.pyo
@@ -1439,6 +1529,9 @@ ${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/cms_plugins
 ${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations/0001_initial.py
 ${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations/0001_initial.pyc
 ${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations/0001_initial.pyo
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations/0002_auto_20151101_0919.py
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations/0002_auto_20151101_0919.pyc
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations/0002_auto_20151101_0919.pyo
 ${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations/__init__.py
 ${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations/__init__.pyc
 ${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/migrations/__init__.pyo
@@ -1448,6 +1541,12 @@ ${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/models.pyo
 ${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/south_migrations/0001_initial.py
 ${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/south_migrations/0001_initial.pyc
 ${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/south_migrations/0001_initial.pyo
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/south_migrations/0002_auto__add_pluginmodelwithfkfrommodel__add_fkmodel__add_pluginmodelwith.py
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/south_migrations/0002_auto__add_pluginmodelwithfkfrommodel__add_fkmodel__add_pluginmodelwith.pyc
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/south_migrations/0002_auto__add_pluginmodelwithfkfrommodel__add_fkmodel__add_pluginmodelwith.pyo
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/south_migrations/0003_auto__del_m2mtargetpluginmodel__del_pluginmodelwithm2mtoplugin__del_pl.py
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/south_migrations/0003_auto__del_m2mtargetpluginmodel__del_pluginmodelwithm2mtoplugin__del_pl.pyc
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/south_migrations/0003_auto__del_m2mtargetpluginmodel__del_pluginmodelwithm2mtoplugin__del_pl.pyo
 ${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/south_migrations/__init__.py
 ${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/south_migrations/__init__.pyc
 ${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/south_migrations/__init__.pyo
@@ -1505,18 +1604,18 @@ ${PYSITELIB}/cms/test_utils/project/sampleapp/__init__.pyo
 ${PYSITELIB}/cms/test_utils/project/sampleapp/admin.py
 ${PYSITELIB}/cms/test_utils/project/sampleapp/admin.pyc
 ${PYSITELIB}/cms/test_utils/project/sampleapp/admin.pyo
-${PYSITELIB}/cms/test_utils/project/sampleapp/cms_app.py
-${PYSITELIB}/cms/test_utils/project/sampleapp/cms_app.pyc
-${PYSITELIB}/cms/test_utils/project/sampleapp/cms_app.pyo
-${PYSITELIB}/cms/test_utils/project/sampleapp/cms_toolbar.py
-${PYSITELIB}/cms/test_utils/project/sampleapp/cms_toolbar.pyc
-${PYSITELIB}/cms/test_utils/project/sampleapp/cms_toolbar.pyo
+${PYSITELIB}/cms/test_utils/project/sampleapp/cms_apps.py
+${PYSITELIB}/cms/test_utils/project/sampleapp/cms_apps.pyc
+${PYSITELIB}/cms/test_utils/project/sampleapp/cms_apps.pyo
+${PYSITELIB}/cms/test_utils/project/sampleapp/cms_menus.py
+${PYSITELIB}/cms/test_utils/project/sampleapp/cms_menus.pyc
+${PYSITELIB}/cms/test_utils/project/sampleapp/cms_menus.pyo
+${PYSITELIB}/cms/test_utils/project/sampleapp/cms_toolbars.py
+${PYSITELIB}/cms/test_utils/project/sampleapp/cms_toolbars.pyc
+${PYSITELIB}/cms/test_utils/project/sampleapp/cms_toolbars.pyo
 ${PYSITELIB}/cms/test_utils/project/sampleapp/forms.py
 ${PYSITELIB}/cms/test_utils/project/sampleapp/forms.pyc
 ${PYSITELIB}/cms/test_utils/project/sampleapp/forms.pyo
-${PYSITELIB}/cms/test_utils/project/sampleapp/menu.py
-${PYSITELIB}/cms/test_utils/project/sampleapp/menu.pyc
-${PYSITELIB}/cms/test_utils/project/sampleapp/menu.pyo
 ${PYSITELIB}/cms/test_utils/project/sampleapp/migrations/0001_initial.py
 ${PYSITELIB}/cms/test_utils/project/sampleapp/migrations/0001_initial.pyc
 ${PYSITELIB}/cms/test_utils/project/sampleapp/migrations/0001_initial.pyo
@@ -1619,150 +1718,153 @@ ${PYSITELIB}/cms/test_utils/util/static_analysis.pyo
 ${PYSITELIB}/cms/tests/__init__.py
 ${PYSITELIB}/cms/tests/__init__.pyc
 ${PYSITELIB}/cms/tests/__init__.pyo
-${PYSITELIB}/cms/tests/admin.py
-${PYSITELIB}/cms/tests/admin.pyc
-${PYSITELIB}/cms/tests/admin.pyo
-${PYSITELIB}/cms/tests/alias.py
-${PYSITELIB}/cms/tests/alias.pyc
-${PYSITELIB}/cms/tests/alias.pyo
-${PYSITELIB}/cms/tests/api.py
-${PYSITELIB}/cms/tests/api.pyc
-${PYSITELIB}/cms/tests/api.pyo
-${PYSITELIB}/cms/tests/apphooks.py
-${PYSITELIB}/cms/tests/apphooks.pyc
-${PYSITELIB}/cms/tests/apphooks.pyo
-${PYSITELIB}/cms/tests/cache.py
-${PYSITELIB}/cms/tests/cache.pyc
-${PYSITELIB}/cms/tests/cache.pyo
-${PYSITELIB}/cms/tests/check.py
-${PYSITELIB}/cms/tests/check.pyc
-${PYSITELIB}/cms/tests/check.pyo
-${PYSITELIB}/cms/tests/django_load.py
-${PYSITELIB}/cms/tests/django_load.pyc
-${PYSITELIB}/cms/tests/django_load.pyo
-${PYSITELIB}/cms/tests/docs.py
-${PYSITELIB}/cms/tests/docs.pyc
-${PYSITELIB}/cms/tests/docs.pyo
-${PYSITELIB}/cms/tests/extensions.py
-${PYSITELIB}/cms/tests/extensions.pyc
-${PYSITELIB}/cms/tests/extensions.pyo
-${PYSITELIB}/cms/tests/fixture_loading.py
-${PYSITELIB}/cms/tests/fixture_loading.pyc
-${PYSITELIB}/cms/tests/fixture_loading.pyo
-${PYSITELIB}/cms/tests/forms.py
-${PYSITELIB}/cms/tests/forms.pyc
-${PYSITELIB}/cms/tests/forms.pyo
-${PYSITELIB}/cms/tests/frontend.py
-${PYSITELIB}/cms/tests/frontend.pyc
-${PYSITELIB}/cms/tests/frontend.pyo
-${PYSITELIB}/cms/tests/i18n.py
-${PYSITELIB}/cms/tests/i18n.pyc
-${PYSITELIB}/cms/tests/i18n.pyo
-${PYSITELIB}/cms/tests/mail.py
-${PYSITELIB}/cms/tests/mail.pyc
-${PYSITELIB}/cms/tests/mail.pyo
-${PYSITELIB}/cms/tests/management.py
-${PYSITELIB}/cms/tests/management.pyc
-${PYSITELIB}/cms/tests/management.pyo
-${PYSITELIB}/cms/tests/menu.py
-${PYSITELIB}/cms/tests/menu.pyc
-${PYSITELIB}/cms/tests/menu.pyo
-${PYSITELIB}/cms/tests/menu_page_viewperm.py
-${PYSITELIB}/cms/tests/menu_page_viewperm.pyc
-${PYSITELIB}/cms/tests/menu_page_viewperm.pyo
-${PYSITELIB}/cms/tests/menu_page_viewperm_staff.py
-${PYSITELIB}/cms/tests/menu_page_viewperm_staff.pyc
-${PYSITELIB}/cms/tests/menu_page_viewperm_staff.pyo
-${PYSITELIB}/cms/tests/menu_utils.py
-${PYSITELIB}/cms/tests/menu_utils.pyc
-${PYSITELIB}/cms/tests/menu_utils.pyo
-${PYSITELIB}/cms/tests/multilingual.py
-${PYSITELIB}/cms/tests/multilingual.pyc
-${PYSITELIB}/cms/tests/multilingual.pyo
-${PYSITELIB}/cms/tests/navextender.py
-${PYSITELIB}/cms/tests/navextender.pyc
-${PYSITELIB}/cms/tests/navextender.pyo
-${PYSITELIB}/cms/tests/nested_plugins.py
-${PYSITELIB}/cms/tests/nested_plugins.pyc
-${PYSITELIB}/cms/tests/nested_plugins.pyo
-${PYSITELIB}/cms/tests/no_i18n.py
-${PYSITELIB}/cms/tests/no_i18n.pyc
-${PYSITELIB}/cms/tests/no_i18n.pyo
-${PYSITELIB}/cms/tests/nonroot.py
-${PYSITELIB}/cms/tests/nonroot.pyc
-${PYSITELIB}/cms/tests/nonroot.pyo
-${PYSITELIB}/cms/tests/page.py
-${PYSITELIB}/cms/tests/page.pyc
-${PYSITELIB}/cms/tests/page.pyo
-${PYSITELIB}/cms/tests/permissions.py
-${PYSITELIB}/cms/tests/permissions.pyc
-${PYSITELIB}/cms/tests/permissions.pyo
-${PYSITELIB}/cms/tests/permmod.py
-${PYSITELIB}/cms/tests/permmod.pyc
-${PYSITELIB}/cms/tests/permmod.pyo
-${PYSITELIB}/cms/tests/placeholder.py
-${PYSITELIB}/cms/tests/placeholder.pyc
-${PYSITELIB}/cms/tests/placeholder.pyo
-${PYSITELIB}/cms/tests/plugins.py
-${PYSITELIB}/cms/tests/plugins.pyc
-${PYSITELIB}/cms/tests/plugins.pyo
-${PYSITELIB}/cms/tests/po.py
-${PYSITELIB}/cms/tests/po.pyc
-${PYSITELIB}/cms/tests/po.pyo
-${PYSITELIB}/cms/tests/publisher.py
-${PYSITELIB}/cms/tests/publisher.pyc
-${PYSITELIB}/cms/tests/publisher.pyo
-${PYSITELIB}/cms/tests/rendering.py
-${PYSITELIB}/cms/tests/rendering.pyc
-${PYSITELIB}/cms/tests/rendering.pyo
-${PYSITELIB}/cms/tests/reversion_tests.py
-${PYSITELIB}/cms/tests/reversion_tests.pyc
-${PYSITELIB}/cms/tests/reversion_tests.pyo
-${PYSITELIB}/cms/tests/security.py
-${PYSITELIB}/cms/tests/security.pyc
-${PYSITELIB}/cms/tests/security.pyo
-${PYSITELIB}/cms/tests/settings.py
-${PYSITELIB}/cms/tests/settings.pyc
-${PYSITELIB}/cms/tests/settings.pyo
-${PYSITELIB}/cms/tests/signals.py
-${PYSITELIB}/cms/tests/signals.pyc
-${PYSITELIB}/cms/tests/signals.pyo
-${PYSITELIB}/cms/tests/site.py
-${PYSITELIB}/cms/tests/site.pyc
-${PYSITELIB}/cms/tests/site.pyo
-${PYSITELIB}/cms/tests/sitemap.py
-${PYSITELIB}/cms/tests/sitemap.pyc
-${PYSITELIB}/cms/tests/sitemap.pyo
-${PYSITELIB}/cms/tests/static_analysis.py
-${PYSITELIB}/cms/tests/static_analysis.pyc
-${PYSITELIB}/cms/tests/static_analysis.pyo
-${PYSITELIB}/cms/tests/static_placeholder.py
-${PYSITELIB}/cms/tests/static_placeholder.pyc
-${PYSITELIB}/cms/tests/static_placeholder.pyo
-${PYSITELIB}/cms/tests/staticfiles.py
-${PYSITELIB}/cms/tests/staticfiles.pyc
-${PYSITELIB}/cms/tests/staticfiles.pyo
-${PYSITELIB}/cms/tests/templates.py
-${PYSITELIB}/cms/tests/templates.pyc
-${PYSITELIB}/cms/tests/templates.pyo
-${PYSITELIB}/cms/tests/templatetags.py
-${PYSITELIB}/cms/tests/templatetags.pyc
-${PYSITELIB}/cms/tests/templatetags.pyo
-${PYSITELIB}/cms/tests/toolbar.py
-${PYSITELIB}/cms/tests/toolbar.pyc
-${PYSITELIB}/cms/tests/toolbar.pyo
-${PYSITELIB}/cms/tests/toolbar_pool.py
-${PYSITELIB}/cms/tests/toolbar_pool.pyc
-${PYSITELIB}/cms/tests/toolbar_pool.pyo
-${PYSITELIB}/cms/tests/urlutils.py
-${PYSITELIB}/cms/tests/urlutils.pyc
-${PYSITELIB}/cms/tests/urlutils.pyo
-${PYSITELIB}/cms/tests/views.py
-${PYSITELIB}/cms/tests/views.pyc
-${PYSITELIB}/cms/tests/views.pyo
-${PYSITELIB}/cms/tests/widgets.py
-${PYSITELIB}/cms/tests/widgets.pyc
-${PYSITELIB}/cms/tests/widgets.pyo
+${PYSITELIB}/cms/tests/test_admin.py
+${PYSITELIB}/cms/tests/test_admin.pyc
+${PYSITELIB}/cms/tests/test_admin.pyo
+${PYSITELIB}/cms/tests/test_alias.py
+${PYSITELIB}/cms/tests/test_alias.pyc
+${PYSITELIB}/cms/tests/test_alias.pyo
+${PYSITELIB}/cms/tests/test_api.py
+${PYSITELIB}/cms/tests/test_api.pyc
+${PYSITELIB}/cms/tests/test_api.pyo
+${PYSITELIB}/cms/tests/test_apphooks.py
+${PYSITELIB}/cms/tests/test_apphooks.pyc
+${PYSITELIB}/cms/tests/test_apphooks.pyo
+${PYSITELIB}/cms/tests/test_cache.py
+${PYSITELIB}/cms/tests/test_cache.pyc
+${PYSITELIB}/cms/tests/test_cache.pyo
+${PYSITELIB}/cms/tests/test_check.py
+${PYSITELIB}/cms/tests/test_check.pyc
+${PYSITELIB}/cms/tests/test_check.pyo
+${PYSITELIB}/cms/tests/test_django_load.py
+${PYSITELIB}/cms/tests/test_django_load.pyc
+${PYSITELIB}/cms/tests/test_django_load.pyo
+${PYSITELIB}/cms/tests/test_docs.py
+${PYSITELIB}/cms/tests/test_docs.pyc
+${PYSITELIB}/cms/tests/test_docs.pyo
+${PYSITELIB}/cms/tests/test_extensions.py
+${PYSITELIB}/cms/tests/test_extensions.pyc
+${PYSITELIB}/cms/tests/test_extensions.pyo
+${PYSITELIB}/cms/tests/test_fixture_loading.py
+${PYSITELIB}/cms/tests/test_fixture_loading.pyc
+${PYSITELIB}/cms/tests/test_fixture_loading.pyo
+${PYSITELIB}/cms/tests/test_forms.py
+${PYSITELIB}/cms/tests/test_forms.pyc
+${PYSITELIB}/cms/tests/test_forms.pyo
+${PYSITELIB}/cms/tests/test_frontend.py
+${PYSITELIB}/cms/tests/test_frontend.pyc
+${PYSITELIB}/cms/tests/test_frontend.pyo
+${PYSITELIB}/cms/tests/test_i18n.py
+${PYSITELIB}/cms/tests/test_i18n.pyc
+${PYSITELIB}/cms/tests/test_i18n.pyo
+${PYSITELIB}/cms/tests/test_mail.py
+${PYSITELIB}/cms/tests/test_mail.pyc
+${PYSITELIB}/cms/tests/test_mail.pyo
+${PYSITELIB}/cms/tests/test_management.py
+${PYSITELIB}/cms/tests/test_management.pyc
+${PYSITELIB}/cms/tests/test_management.pyo
+${PYSITELIB}/cms/tests/test_menu.py
+${PYSITELIB}/cms/tests/test_menu.pyc
+${PYSITELIB}/cms/tests/test_menu.pyo
+${PYSITELIB}/cms/tests/test_menu_page_viewperm.py
+${PYSITELIB}/cms/tests/test_menu_page_viewperm.pyc
+${PYSITELIB}/cms/tests/test_menu_page_viewperm.pyo
+${PYSITELIB}/cms/tests/test_menu_page_viewperm_staff.py
+${PYSITELIB}/cms/tests/test_menu_page_viewperm_staff.pyc
+${PYSITELIB}/cms/tests/test_menu_page_viewperm_staff.pyo
+${PYSITELIB}/cms/tests/test_menu_utils.py
+${PYSITELIB}/cms/tests/test_menu_utils.pyc
+${PYSITELIB}/cms/tests/test_menu_utils.pyo
+${PYSITELIB}/cms/tests/test_multilingual.py
+${PYSITELIB}/cms/tests/test_multilingual.pyc
+${PYSITELIB}/cms/tests/test_multilingual.pyo
+${PYSITELIB}/cms/tests/test_navextender.py
+${PYSITELIB}/cms/tests/test_navextender.pyc
+${PYSITELIB}/cms/tests/test_navextender.pyo
+${PYSITELIB}/cms/tests/test_nested_plugins.py
+${PYSITELIB}/cms/tests/test_nested_plugins.pyc
+${PYSITELIB}/cms/tests/test_nested_plugins.pyo
+${PYSITELIB}/cms/tests/test_no_i18n.py
+${PYSITELIB}/cms/tests/test_no_i18n.pyc
+${PYSITELIB}/cms/tests/test_no_i18n.pyo
+${PYSITELIB}/cms/tests/test_nonroot.py
+${PYSITELIB}/cms/tests/test_nonroot.pyc
+${PYSITELIB}/cms/tests/test_nonroot.pyo
+${PYSITELIB}/cms/tests/test_page.py
+${PYSITELIB}/cms/tests/test_page.pyc
+${PYSITELIB}/cms/tests/test_page.pyo
+${PYSITELIB}/cms/tests/test_permissions.py
+${PYSITELIB}/cms/tests/test_permissions.pyc
+${PYSITELIB}/cms/tests/test_permissions.pyo
+${PYSITELIB}/cms/tests/test_permmod.py
+${PYSITELIB}/cms/tests/test_permmod.pyc
+${PYSITELIB}/cms/tests/test_permmod.pyo
+${PYSITELIB}/cms/tests/test_placeholder.py
+${PYSITELIB}/cms/tests/test_placeholder.pyc
+${PYSITELIB}/cms/tests/test_placeholder.pyo
+${PYSITELIB}/cms/tests/test_plugins.py
+${PYSITELIB}/cms/tests/test_plugins.pyc
+${PYSITELIB}/cms/tests/test_plugins.pyo
+${PYSITELIB}/cms/tests/test_po.py
+${PYSITELIB}/cms/tests/test_po.pyc
+${PYSITELIB}/cms/tests/test_po.pyo
+${PYSITELIB}/cms/tests/test_publisher.py
+${PYSITELIB}/cms/tests/test_publisher.pyc
+${PYSITELIB}/cms/tests/test_publisher.pyo
+${PYSITELIB}/cms/tests/test_rendering.py
+${PYSITELIB}/cms/tests/test_rendering.pyc
+${PYSITELIB}/cms/tests/test_rendering.pyo
+${PYSITELIB}/cms/tests/test_reversion_tests.py
+${PYSITELIB}/cms/tests/test_reversion_tests.pyc
+${PYSITELIB}/cms/tests/test_reversion_tests.pyo
+${PYSITELIB}/cms/tests/test_security.py
+${PYSITELIB}/cms/tests/test_security.pyc
+${PYSITELIB}/cms/tests/test_security.pyo
+${PYSITELIB}/cms/tests/test_settings.py
+${PYSITELIB}/cms/tests/test_settings.pyc
+${PYSITELIB}/cms/tests/test_settings.pyo
+${PYSITELIB}/cms/tests/test_signals.py
+${PYSITELIB}/cms/tests/test_signals.pyc
+${PYSITELIB}/cms/tests/test_signals.pyo
+${PYSITELIB}/cms/tests/test_site.py
+${PYSITELIB}/cms/tests/test_site.pyc
+${PYSITELIB}/cms/tests/test_site.pyo
+${PYSITELIB}/cms/tests/test_sitemap.py
+${PYSITELIB}/cms/tests/test_sitemap.pyc
+${PYSITELIB}/cms/tests/test_sitemap.pyo
+${PYSITELIB}/cms/tests/test_static_analysis.py
+${PYSITELIB}/cms/tests/test_static_analysis.pyc
+${PYSITELIB}/cms/tests/test_static_analysis.pyo
+${PYSITELIB}/cms/tests/test_static_placeholder.py
+${PYSITELIB}/cms/tests/test_static_placeholder.pyc
+${PYSITELIB}/cms/tests/test_static_placeholder.pyo
+${PYSITELIB}/cms/tests/test_staticfiles.py
+${PYSITELIB}/cms/tests/test_staticfiles.pyc
+${PYSITELIB}/cms/tests/test_staticfiles.pyo
+${PYSITELIB}/cms/tests/test_templates.py
+${PYSITELIB}/cms/tests/test_templates.pyc
+${PYSITELIB}/cms/tests/test_templates.pyo
+${PYSITELIB}/cms/tests/test_templatetags.py
+${PYSITELIB}/cms/tests/test_templatetags.pyc
+${PYSITELIB}/cms/tests/test_templatetags.pyo
+${PYSITELIB}/cms/tests/test_toolbar.py
+${PYSITELIB}/cms/tests/test_toolbar.pyc
+${PYSITELIB}/cms/tests/test_toolbar.pyo
+${PYSITELIB}/cms/tests/test_toolbar_pool.py
+${PYSITELIB}/cms/tests/test_toolbar_pool.pyc
+${PYSITELIB}/cms/tests/test_toolbar_pool.pyo
+${PYSITELIB}/cms/tests/test_urlutils.py
+${PYSITELIB}/cms/tests/test_urlutils.pyc
+${PYSITELIB}/cms/tests/test_urlutils.pyo
+${PYSITELIB}/cms/tests/test_views.py
+${PYSITELIB}/cms/tests/test_views.pyc
+${PYSITELIB}/cms/tests/test_views.pyo
+${PYSITELIB}/cms/tests/test_widgets.py
+${PYSITELIB}/cms/tests/test_widgets.pyc
+${PYSITELIB}/cms/tests/test_widgets.pyo
+${PYSITELIB}/cms/tests/test_wizards.py
+${PYSITELIB}/cms/tests/test_wizards.pyc
+${PYSITELIB}/cms/tests/test_wizards.pyo
 ${PYSITELIB}/cms/toolbar/__init__.py
 ${PYSITELIB}/cms/toolbar/__init__.pyc
 ${PYSITELIB}/cms/toolbar/__init__.pyo
@@ -1787,6 +1889,9 @@ ${PYSITELIB}/cms/utils/__init__.pyo
 ${PYSITELIB}/cms/utils/admin.py
 ${PYSITELIB}/cms/utils/admin.pyc
 ${PYSITELIB}/cms/utils/admin.pyo
+${PYSITELIB}/cms/utils/apphook_reload.py
+${PYSITELIB}/cms/utils/apphook_reload.pyc
+${PYSITELIB}/cms/utils/apphook_reload.pyo
 ${PYSITELIB}/cms/utils/check.py
 ${PYSITELIB}/cms/utils/check.pyc
 ${PYSITELIB}/cms/utils/check.pyo
@@ -1856,6 +1961,24 @@ ${PYSITELIB}/cms/utils/urlutils.pyo
 ${PYSITELIB}/cms/views.py
 ${PYSITELIB}/cms/views.pyc
 ${PYSITELIB}/cms/views.pyo
+${PYSITELIB}/cms/wizards/__init__.py
+${PYSITELIB}/cms/wizards/__init__.pyc
+${PYSITELIB}/cms/wizards/__init__.pyo
+${PYSITELIB}/cms/wizards/forms.py
+${PYSITELIB}/cms/wizards/forms.pyc
+${PYSITELIB}/cms/wizards/forms.pyo
+${PYSITELIB}/cms/wizards/urls.py
+${PYSITELIB}/cms/wizards/urls.pyc
+${PYSITELIB}/cms/wizards/urls.pyo
+${PYSITELIB}/cms/wizards/views.py
+${PYSITELIB}/cms/wizards/views.pyc
+${PYSITELIB}/cms/wizards/views.pyo
+${PYSITELIB}/cms/wizards/wizard_base.py
+${PYSITELIB}/cms/wizards/wizard_base.pyc
+${PYSITELIB}/cms/wizards/wizard_base.pyo
+${PYSITELIB}/cms/wizards/wizard_pool.py
+${PYSITELIB}/cms/wizards/wizard_pool.pyc
+${PYSITELIB}/cms/wizards/wizard_pool.pyo
 ${PYSITELIB}/menus/__init__.py
 ${PYSITELIB}/menus/__init__.pyc
 ${PYSITELIB}/menus/__init__.pyo
diff --git a/www/py-django-cms/distinfo b/www/py-django-cms/distinfo
index 4722ff05cd2..e19dec00fd2 100644
--- a/www/py-django-cms/distinfo
+++ b/www/py-django-cms/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.27 2015/11/04 02:47:25 agc Exp $
+$NetBSD: distinfo,v 1.28 2015/11/24 17:33:01 adam Exp $
 
-SHA1 (django-cms-3.1.3.tar.gz) = 8b9f8bbccf672db12abac65f94b6b1d7097acb0d
-RMD160 (django-cms-3.1.3.tar.gz) = 1c385a6e224897032675a121f783108c83e5ca4b
-SHA512 (django-cms-3.1.3.tar.gz) = 830081a29ab99de1fb81fe6f66623f2693c7b0815891a51eaedc739a7f1ae3bc47e82105ee07fd1d30f39dc9e3c85bc3eff8ccc2322015c86497ed07da6345ea
-Size (django-cms-3.1.3.tar.gz) = 8551236 bytes
+SHA1 (django-cms-3.2.0.tar.gz) = c7f6de6669e319d67f7e0404c7c41dc2067af9fe
+RMD160 (django-cms-3.2.0.tar.gz) = 4e4fa6569e797969301b7bdfd66a30e3d794d59f
+SHA512 (django-cms-3.2.0.tar.gz) = 6b16133bbd4829a4588c4c4976100f891f54dc50da031df7ac11c4491ece3228985ebde014049019f6941c3121bb78306eff2811fba47ac4de862ff56b2f1a44
+Size (django-cms-3.2.0.tar.gz) = 4600467 bytes