JARVIS-420 added status middleware
Merge branch 'develop' into release/3.2

Conflicts:
	package.json