Merge remote-tracking branch 'origin/master'

Conflicts:
	Cigam-csharp.sln
	Cigam.sln
	Cigam.userprefs