Merge branch 'master' into develop
fixed for composer install path
Merge branch 'composer' into develop
1.5.5
Merge branch 'release/1.5.5'