primefaces template fix
primefaces template fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Messaging/pom.xml