Commit
COmit

Conflicts:
	nbproject/project.properties
	nbproject/project.xml