This wasn't supposed to make it into the commit.

Signed-off-by: Jack Huey kitskub@gmail.com
Fix NPE

Signed-off-by: Jack Huey kitskub@gmail.com
Merge branch 'master' into new-math

Conflicts:

engine/src/main/java/org/spout/engine/component/entity/SpoutPhysicsCompo
nent.java