Cal & Andy - Begin Refactoring of Routes
Cal & Andy - More refactoring
Merge branch 'master' into user-facing-paddle

Conflicts:
	rps/beta_claim_forms/routes.py
Merge pull request #231 from InsolvencyService/user-facing-paddle

User facing paddle