test merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Social/WebContent/layout/footer.xhtml
	Social/WebContent/layout/menu.xhtml
	Social/WebContent/layout/template.xhtml