Merge origin/master

Conflicts:
	DesignerRHN/DesignerRHN-war/web/WEB-INF/faces-config.xml