removed uid and provider from user
Merge branch 'dev' of ssh://personal/codeflash/codeflash into dev