Issue #324 completed
Merge remote-tracking branch 'upstream/development' into development

Conflicts:
	AjourBT/Views/Home/DIRView.cshtml
Merge pull request #496 from nazariitashak/development

Issue #324 completed