changed project files and solution file to make the branch compatible with current trunk version. #1142