Merge branch 'master' into develop
life story & directions
Merge branch 'hotfix/padding_text_vie' into develop
Merge remote-tracking branch 'origin/develop'