Consumer login failed with invalid credentials features
Merge branch 'master' of https://github.com/analog-analytics/Bespoke_Offers_QA_Test_Automation into 65545568_consumer_registration_via_existing_Facebook_account

Conflicts:
	regression-test-pack/features/step_definitions/sign_in_steps.rb
Merge branch 'master' of https://github.com/analog-analytics/Bespoke_Offers_QA_Test_Automation into 65545568_consumer_registration_via_existing_Facebook_account
Update
@wip
Merge branch 'master' of https://github.com/analog-analytics/Bespoke_Offers_QA_Test_Automation into 65545568_consumer_registration_via_existing_Facebook_account

Conflicts:
	regression-test-pack/features/step_definitions/user_steps.rb
	regression-test-pack/features/support/world_pages.rb
	regression-test-pack/lib/data/users.rb
	regression-test-pack/lib/pages/portal_page.rb
commit
commit
commit to accept changes
Merge branch 'master' of https://github.com/analog-analytics/Bespoke_Offers_QA_Test_Automation into 65545568_consumer_registration_via_existing_Facebook_account
consumer registeration with existing facebook completed
Merge branch 'master' of https://github.com/analog-analytics/Bespoke_Offers_QA_Test_Automation into 65545568_consumer_registration_via_existing_Facebook_account

Conflicts:
	regression-test-pack/features/consumer_portal/log_in/facebook_login.feature
Remove duplicate my_account features
Merge branch 'master' of https://github.com/analog-analytics/Bespoke_Offers_QA_Test_Automation
Removed tags log_in/facebook_login.feature still has merge tags in
Merge branch 'master' of https://github.com/analog-analytics/Bespoke_Offers_QA_Test_Automation
Fix facebook login feature problem.  Restre the correct text
Added FaceBook login and My Account edit scenarios
65956186_consumer_purchase_via_existing_bPay: WIP