Intermediate commit
Merge branch 'dev' into cli

Conflicts:
	Secloud.sln
Fix MonoDevelop C# style