Merge branch 'master' into algorithm

Conflicts:
	Solver/src/stimim/solver/Solver.java
send events
Add damage calculator for dark team. enhance script
Merge branch 'master' into algorithm

Conflicts:
	Solver/src/stimim/solver/Solver.java -> use master
Merge branch 'algorithm' into sendevent
speed up sendevent!
fix timing issue of sendevent
extract variables
fix gen_web_demo.py
some minor changes