Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dev/HVServices/HVEntity/Entities/Entry.cs