update submodules
Merge branch 'master' into stats-n

Conflicts:
	submodules/core-hq-src