content & HTML view integration, various bugfixes
bumped version
Merge branch 'release/0.6.0' into develop