Fixed stupid properties thing
Merge branch 'master' into Caleb_Branch

Conflicts:
	nbproject/private/private.properties