Merge branch 'release/1.7.1' into develop
imagetext page template for the special times
bump version to 1.8.0
Merge branch 'release/1.8.0'