Merge origin/master

Conflicts:
	DesignerRHN/DesignerRHN-war/nbproject/faces-config.NavData
Merge origin/master

Conflicts:
	DesignerRHN/DesignerRHN-war/nbproject/faces-config.NavData
Merge origin/master