Merge branch 'macbook-branch'
Merge branch 'master' into macbook-branch
removed remember me option from login
Merge pull request #156 from californiavol/macbook-branch

Macbook branch