testing sim
hide simulate row
bug fixes for server sim
double definition of property
Merge branch 'master' into server-sim

Conflicts:
	main.py
Merge branch 'master' into server-sim

Conflicts:
	main.py
refactored sim
some profiling
some more tweaking