worked version
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.idea/misc.xml
	.idea/modules.xml
	.idea/workspace.xml
	.idea/zq_bus.iml