Merge pull request #1 from divio/develop

updating fork from master
fix for setting inheritance on a page
temp reverting #2606 change as it is blowing up
Fixed tests to support specifying user model on the command line, and custom models that do not have a username field, or use email as username field
Merged upstream changes
removing the spaceless tags as it mucks with html output
Merge pull request #2 from daegun/removeSpaceless

removing the spaceless tags as it mucks with html output
Minor docstring change
fixes #2613
fixed reversion tests
Merge branch 'develop' into fix-2583
reverted some of the new ordering logic
Merge pull request #2617 from digi604/fix-2613

fixes #2613 (plugin edit marks page as dirty again)
Merge pull request #2595 from digi604/fix-2583

Fix 2583
bumps version to 3.0b4.dev5
Added a check when trying to set application urls and namespace in post_save_page signal.
Merge branch 'develop' into ticket_1916_develop_merge
validation for plugins. added more docs for child plugins
quickfix for failing redirects with DEBUG=True

This is only a temporary quickfix for a situation where with DEBUG=True all redirects would cause an Exception, because the self.page attribute did not exist.
The real fix would be to find out why this stuff is even being called on redirects.
bumps version to 3.0b4.dev6