MacOS X fixes:
- gui
- build scripts
CMake fixes
CMake sripts devel
CMake scripts devel
CMake scripts devel
CMake scripts devel
CMakeLists scripts devel
Fixes
Fixes
DS_Store update.
Merge branch 'macosx' into develop

Conflicts:
	source/ui/resources/userinterface.ui