Merge branch 'release/0.6' into develop
Fixed default template to view comments and metadata in pages.
Introduced page-comments variable.
Ready for version 0.6.1.
Merge branch 'release/0.6.1'