Merge branch 'master' into config-and-serialization
Merge branch 'master' into config-and-serialization
starting json-based config i/o
PlayerManager should not create its own duplicate of RoundState.
Merge branch 'master' into config-and-serialization
implementing json config loading
implemented json config saving
Merge branch 'config-and-serialization'
improving logging output (see #18)
Merge branch 'logging-and-diagnostics'
Merge branch 'master' into 3dphysics

Conflicts:
	src/BleepoutConfig.h
updating logging code to handle new physics objects

see #18