Merge branch 'develop' into huwei
asdsk
Merge branch 'huwei' into develop

Conflicts:
	main.cpp