Merge branch 'devel' into COM_test

Conflicts:
	Sync.vcxproj
	Sync.vcxproj.filters
Merge branch 'COM_test' of https://github.com/gumallett/Sync into COM_test