Merge branch 'release/1.6.0' into develop
Fixed 31 march bug
Git fixed icons in events
Bump release to 1.6.1
Fixed merge conflict
fixed bundle
Merge branch 'hotfix/bundlestuff'