changed login timeout from 20 to 90 seconds
Merge branch 'master' into unstable