[bug fixes] fixing merge conflicts
[101] added omniauth scenarios to cucumber login tests