ignore
Merge branch 'master' into newsetupmerge
remote js logger; fixed federated login