smooth
completed for humans
Merge remote-tracking branch 'origin/master'

Conflicts:
	inference-engine/simulator/runtime_simulator.py