started implementing JSON import
Merge branch 'physics_simulation' of https://github.com/crisHH/Angry-Birds

Conflicts:
	src/ab/physics/simulation/AngryBirdsPhysicsTest.java
	src/ab/physics/simulation/InfoObject.java
	src/ab/physics/simulation/InfoObjects.java
	src/ab/physics/simulation/PhysicsSimulation.java