Custom fields editing
Merge origin/master

Conflicts:
	nbproject/customs.json