Merge branch 'development-branch'
Merge branch 'master' of https://github.com/AVC-Media-Enterprises/AVC-Test