Merge branch 'hotfix/v1.1.1'
Updated cd-1 theme
cd-3 theme setup
cd-3 minor + cd-4 setup
Merge pull request #4 from sfucode/master

Pulling changes back to develop