Merge branch 'hotfix/0.6.1'
Change to always use canvas instead of webgl

- Remove server reconciliation (until fixed)
- Reorder components
Merge branch 'hotfix/0.6.2' into develop