added neutral policy (needed for testing), other work preparing unit tests for the simulation
Merge remote-tracking branch 'origin/master'