Merge pull request #118 from aholmes/master

Add C#, cshtml, and XML syntax highlighting to 1-n and n-n relationship documentation.
Revert "Add C#, cshtml, and XML syntax highlighting to 1-n and n-n relationship documentation."
Merge pull request #119 from OrchardCMS/revert-118-master

Revert "Add C#, cshtml, and XML syntax highlighting to 1-n and n-n relat...
Resolve conflict from upstream pull.