Merge branch 'dev' into cli

Conflicts:
	Secloud.sln