Merge branch 'develop' of github.com:divio/django-cms into develop
Update menu_tags.py

Parent is nulled for menu nodes, this isn't very comfortable in some situations
fixes a positioning issue when resizinh or dragging the modal
bumps version to 3.0b4.dev7
fixes issue “2464
create outer bound for the sideframe, fixes #2459
Update menu.py
fix drag&drop
Merge pull request #2637 from digi604/fix-dd

fix drag&drop
Merge pull request #2632 from belegnar/patch-1

Update menu_tags.py
Merge pull request #2636 from belegnar/patch-2

Update menu.py
add restriction when sideframe is larger than window on refresh, fixes #2458
Merge pull request #2638 from FinalAngel/develop

Fixes issues with the sidebar
Removed extraneous comments, updated documentation, and fixed support for PageUser
Merged upstream changes
Removed proxytypes dependency
Merge branch 'develop' of github.com:tanderegg/django-cms into develop

Conflicts:
	cms/tests/publisher.py