Dreamvids 2.0 - Merging dev branch