added support for setting users authtoken
Merge branch 'master' into develop
fixed reload to not re-login.  Optional auth-token now holds