Bump version
Merge branch 'release/0.6'
Merge tag '0.6' into develop

UI and bug fixes