Merge remote-tracking branch 'origin/master'

Conflicts:
	Dev/HVServices/HVEntity/Entities/Entry.cs
	_Doc/HTML/category.html
	_Doc/HTML/footer.html
	_Doc/HTML/forget-pass.html
	_Doc/HTML/register.html
Merge remote-tracking branch 'origin/master'