Merge branch 'develop'
Merge branch 'develop'
added functions to composer's bootstrap process
Merge branch 'hotfix-autoloader'
Merge branch 'master' into develop