added login
Merge branch 'master' of https://github.com/nlujan/Capture
Merge branch 'master' into integrate_home_page