Assign pre-build steps to OpenCBS.Enums as this is the first project in the build sequence.
Add OpenCBS.Extensions.Samples as a dependency for OpenCBS.GUI.
Remove GreenPeppers settings from the solution and project files.
Resolve merge conflict.