retest button open a dialog not a activity
-new login page and some fixed bugs
merge
Merge remote-tracking branch 'origin/master'
third login