Committing to remove conflict
Merge branch 'master' of
ssh://git@github.com/toknmqa/HealthUnlockedAutomation

Conflicts:
	src/test/java/features/create_account_and_join.feature
	src/test/java/features/create_account_and_login_popups.feature
Merge branch 'master' of ssh://git@github.com/toknmqa/HealthUnlockedAutomation
T104 complete