set production/staging password
resolve conflicts
update production/staging password
Merge branch 'master' of github.com:worldintime/IceBreakerTest
Merge branch 'master' into staging