Merge remote-tracking branch 'origin/pr/25'

Close #25
Added dev-develop => 1.1-dev branch-alias
Merge branch 'hotfix/composer-branch-alias' into develop