added some changes
Merge branch 'development' of https://github.com/ambreenhasan/cloud-dj into development