Fixed cucumber so modal view of user sign in is different labels than the sign in page
Fixed merge conflict