Cherry-pick from develop: Stop tracking nbproject/project.bak.xml and .gitignore it.

Conflicts:

	nbproject/project.bak.xml