login and apikey
login fixes
Merge branch 'master' into gh-pages