Working on managment/useredit
Merge branch 'master' of github.com:Castcloud/Castcloud

merge with managment/useredit