Merging stylecop branch after adding StyleCop and refactoring the projects