Merge origin/master

Conflicts:
	MOSES_FC/nbproject/configurations.xml
	MOSES_FC/nbproject/private/private.xml