register login
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/groovy/LaSenza/steps/UserSteps.groovy