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

Conflicts:

	nbproject/project.bak.xml
Merge branch 'develop' of github.com:prog694/desiree into develop
Put instances of subsystems in DESiree.