Adding .NET Guidelines
Merge branch 'dev' into dev-net

Conflicts:
	README.md