Merge branch 'hotfix/1.0.2'
Merge branch 'release/cumulus-1.1.0'
Fixed typo
Now checking the environment context before parsing the stack #117
Bumped version to 1.1.1
Merge branch 'hotfix/cumulus-1.1.1' into develop

Conflicts:
	cumulus/cumulus_ds/settings.conf