login page and forgot  pwd page
Merge branch 'issue-138' into develop
Merge branch 'develop'