Added another login test page
Work on login page
Merge remote-tracking branch 'origin/master'