Merge remote-tracking branch 'origin/master'

Conflicts:
	InfoTech2u.Verithus/InfoTech2u.Verithus.WEB/include/xml/database