Merge origin/master

Conflicts:
	nbproject/project.properties
	nbproject/project.xml
	public_html/editor.html
	public_html/index.html
	public_html/js/box2d/collision/ClipVertex.js
	public_html/js/box2d/collision/Features.js
	public_html/js/box2d/collision/b2AABB.js
	public_html/js/box2d/collision/b2Bound.js
	public_html/js/box2d/collision/b2BoundValues.js
	public_html/js/box2d/collision/b2BroadPhase.js
	public_html/js/box2d/collision/b2BufferedPair.js
	public_html/js/box2d/collision/b2Collision.js
	public_html/js/box2d/collision/b2ContactID.js
	public_html/js/box2d/collision/b2ContactPoint.js
	public_html/js/box2d/collision/b2Distance.js
	public_html/js/box2d/collision/b2Manifold.js
	public_html/js/box2d/collision/b2OBB.js
	public_html/js/box2d/collision/b2Pair.js
	public_html/js/box2d/collision/b2PairCallback.js
	public_html/js/box2d/collision/b2PairManager.js
	public_html/js/box2d/collision/b2Proxy.js
	public_html/js/box2d/collision/shapes/b2BoxDef.js
	public_html/js/box2d/collision/shapes/b2CircleDef.js
	public_html/js/box2d/collision/shapes/b2CircleShape.js
	public_html/js/box2d/collision/shapes/b2MassData.js
	public_html/js/box2d/collision/shapes/b2PolyDef.js
	public_html/js/box2d/collision/shapes/b2PolyShape.js
	public_html/js/box2d/collision/shapes/b2Shape.js
	public_html/js/box2d/collision/shapes/b2ShapeDef.js
	public_html/js/box2d/common/b2Settings.js
	public_html/js/box2d/common/math/b2Mat22.js
	public_html/js/box2d/common/math/b2Math.js
	public_html/js/box2d/common/math/b2Vec2.js
	public_html/js/box2d/dynamics/b2Body.js
	public_html/js/box2d/dynamics/b2BodyDef.js
	public_html/js/box2d/dynamics/b2CollisionFilter.js
	public_html/js/box2d/dynamics/b2ContactManager.js
	public_html/js/box2d/dynamics/b2Island.js
	public_html/js/box2d/dynamics/b2TimeStep.js
	public_html/js/box2d/dynamics/b2World.js
	public_html/js/box2d/dynamics/b2WorldListener.js
	public_html/js/box2d/dynamics/contacts/b2CircleContact.js
	public_html/js/box2d/dynamics/contacts/b2Conservative.js
	public_html/js/box2d/dynamics/contacts/b2Contact.js
	public_html/js/box2d/dynamics/contacts/b2ContactConstraint.js
	public_html/js/box2d/dynamics/contacts/b2ContactConstraintPoint.js
	public_html/js/box2d/dynamics/contacts/b2ContactNode.js
	public_html/js/box2d/dynamics/contacts/b2ContactRegister.js
	public_html/js/box2d/dynamics/contacts/b2ContactSolver.js
	public_html/js/box2d/dynamics/contacts/b2NullContact.js
	public_html/js/box2d/dynamics/contacts/b2PolyAndCircleContact.js
	public_html/js/box2d/dynamics/contacts/b2PolyContact.js
	public_html/js/box2d/dynamics/joints/b2DistanceJoint.js
	public_html/js/box2d/dynamics/joints/b2DistanceJointDef.js
	public_html/js/box2d/dynamics/joints/b2GearJoint.js
	public_html/js/box2d/dynamics/joints/b2GearJointDef.js
	public_html/js/box2d/dynamics/joints/b2Jacobian.js
	public_html/js/box2d/dynamics/joints/b2Joint.js
	public_html/js/box2d/dynamics/joints/b2JointDef.js
	public_html/js/box2d/dynamics/joints/b2JointNode.js
	public_html/js/box2d/dynamics/joints/b2MouseJoint.js
	public_html/js/box2d/dynamics/joints/b2MouseJointDef.js
	public_html/js/box2d/dynamics/joints/b2PrismaticJoint.js
	public_html/js/box2d/dynamics/joints/b2PrismaticJointDef.js
	public_html/js/box2d/dynamics/joints/b2PulleyJoint.js
	public_html/js/box2d/dynamics/joints/b2PulleyJointDef.js
	public_html/js/box2d/dynamics/joints/b2RevoluteJoint.js
	public_html/js/box2d/dynamics/joints/b2RevoluteJointDef.js
	public_html/js/editor.js
	public_html/js/game.js
	public_html/js/objectFactory.js
	public_html/js/renderer.js
	public_html/js/testlevel.js