fixing common templace
Merge branch 'master' of https://github.com/davidhockey22/CommunityServiceWeb

Conflicts:
	CommunityService/WebContent/commonTemplate.xhtml