Changed test username (playing with branch/merge)
Changed test username and use parameter in Then clause of Scenario (playing with branches)
Merge branch 'master' into feature
Renamed test user back to marko
Fixed up the User Feature spec text
Merge branch 'master' into feature