Some changes reverted for build on Windows and Mac
Some changes reverted for build on Windows and Mac 2
Merge branch 'master' into linux-1.2

Conflicts:
	CmisSync.Lib/CmisSync.Lib.csproj
Merge pull request #397 from mhawari/linux-1.2

Merge revert commit for Linux 1.2