Updated .csproj to get rid of conflict error. Pushed rest of devrw-demo.