Basic implementation of factory_boy, ref #306
put factory_boy in correct requirements file, ref #306
fix merge conflicts
migrate tests to use EventFactory
cleanup test
fix requirements conflicts
Merge pull request #334 from gandalfar/factory_boy

Factory boy finally merged :)
Should fix missing location issue #308
Merge pull request #346 from sparkica/fix_zero_location

Fix for missing location - ouyeah
simplifying the scoreboard design
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into scoreboard
cleaning up events after testing