Merge branch 'hotfix-1.5.4.1'
fix parameters for users
move lib/assets & vendor/assets to app/assets
bump version to 1.5.4.2