Merge remote-tracking branch 'origin/master'

Conflicts:
	main/app/CMakeLists.txt
	main/src/modules/CMakeLists.txt