[CMake:] Fixed errors
Merge branch 'master' of https://github.com/ArcPro/ArcPro

Conflicts:
	cmake/scripts/eventscripts/CMakeLists.txt
[CMake:] Removed a issue with an unresolved merge