Merge branch 'development'
Composer manager issue
Composer manager mistake
Merge branch 'master' into development