Merge branch 'hotfix/better_ui'
gitignore .bundle folder
Merge branch 'master' into develop