color change for grid
Merge remote-tracking branch 'origin/new_development' into new_development

Conflicts:
	web/resources/js/simulation.js
changes in gitignore file

Git was commiting the local netbeans project properties file from the
new branch