Removed Cmake temporary files
fixed merge conflicts between next and hotfix1