Merge branch 'develop'
Collapsible menu fix
Merge branch 'release-0.1' into develop