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