Merge branch 'release/1.7'
Ignoring local south migrations data.
Merge branch 'release/1.8'
Only logged plans should redirect to completed page.

New plans were also redirecting. Fixed.
Merge branch 'hotfix/1.8.1' into develop