Merge remote-tracking branch 'origin/master'

Conflicts:
	ORM.Library/ORM.Library.vcxproj.filters
Bouh !