updated .resx
Merge remote-tracking branch 'origin/f-roadmap-2013' into f-roadmap-2013
updated .csproj