Merge branch 'develop' into ports/macos
Fix cmake install
Merge branch 'ports/macos' of https://github.com/Vatsinator/Vatsinator into ports/macos

Conflicts:
	source/CMakeLists.txt