Merge branch 'hotfix/assets'
Merge branch 'develop'
second release
assets try
finish hotfix
merge from master