sandpit: forgotten password test
Merge branch 'master' into wip

Conflicts:
	sandpit/features/consumer_login.feature
	sandpit/features/step_definitions/consumer_portal_steps.rb
sandbox: fix for login typo
first commit
Update consumer_portal_steps.rb

remove redundant import (reset_password)
Merge remote-tracking branch 'dean/master'
Include password reset

Conflicts:
	sandpit/features/consumer_login.feature
	sandpit/features/step_definitions/consumer_portal_steps.rb