d
merge fix
Merge branch 'master' of https://github.com/bogdanpopescuarvo/st

Conflicts:
	content/src/main/content/jcr_root/apps/st/templates/contactusdisplaytemplate/.content.xml