Merge origin/master

Conflicts:
	build.xml
	manifest.mf
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	res/cube.dat
	src/Library/FacesNObjects/Face.java
	src/Library/FacesNObjects/GObject.java
	src/Library/PointsNVectors/Point3D.java
	src/Library/PointsNVectors/Vector3D.java