Change project file after merge with develop
Change solution file after merge with develop