fixed ng-cloack and added username
Merge branch 'master' into deploy