Merge branch 'master' of https://github.com/Castcloud/Castcloud
Merge branch 'master' of https://github.com/Castcloud/Castcloud