Fix wage details page form fill
Move conversion to conversions.py
Merge branch 'master' into fix-wages-detail-page-population

Conflicts:
	rps/beta_claim_forms/conversions.py
	rps/forms/templates/form_macros.html
Fix tests for wages
Show errors
Remove wage type and use custom template for wage details
Merge pull request #188 from InsolvencyService/fix-wages-detail-page-population

Fix wages detail page population