Merge origin/master

Conflicts:
	faces-config.NavData
	src/main/webapp/resources/css/jsfcrud.css