Move all lines to store sub type and rate against contact
fix indentation
Merge branch 'develop' into feature/save-the-users-initial-subscription-against-contact

Fixed Conflicts:
	test/chw.test.js
	test/clinic.test.js
	test/personal.test.js