Change system to support adding bodies
Merge branch 'master' into old

Conflicts:
	src/System.cpp