Updated VisualStudio Project
Merge remote-tracking branch 'origin/devel' into locations