Merge origin/master

Conflicts:
	nbproject/faces-config.NavData