Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	.gitmodules
#	CellFrameDashboardGUI/CellFrameDashboardGUI.pro
#	CellFrameDashboardService/CellFrameDashboardService.pro
#	cellframe-sdk
#	cellframe-ui-sdk
#	dap-ui-sdk
#	prod_build
#	prod_build/general/chroot_wrap.sh
#	prod_build/general/conf/status
#	prod_build/general/pre-build.sh
#	prod_build/linux/debian/conf/publish
#	prod_build/linux/debian/essentials/changelog
#	prod_build/linux/debian/essentials/control
#	prod_build/linux/debian/scripts/build.sh
#	prod_build/linux/debian/scripts/chroot/post-build.sh
#	prod_build/linux/debian/scripts/chroot/pre-build.sh
#	prod_build/linux/debian/scripts/compile_and_pack.sh
#	prod_build/linux/debian/scripts/deploy.sh
#	prod_build/linux/debian/scripts/post-build.sh
#	prod_build/linux/debian/scripts/pre-build.sh
#	prod_build/mac/scripts/compile.sh
#	prod_build/mac/scripts/deploy.sh
#	prod_build/mac/scripts/pack.sh
#	prod_build/mac/scripts/pre-build.sh