Merge branch 'dev_rename_userEntity'
composer selfupdate & update
Merge branch 'dev_updateComposer'