Updated modules to new template in development.
Merge branch 'v5-stable' into v7-stable

Conflicts:
	source/configuration/modules/imfile.rst
Merge branch 'v7-stable'