Little change for functional tests to work id added to login button
Merge remote-tracking branch 'origin/dev' into dev