Issue #445(not finished)
Merge remote-tracking branch 'upstream/test' into development

Conflicts:
	AjourBT/Controllers/PUController.cs
	AjourBT/Scripts/AjourBTScript/DepScript.js
Issue #445 completed. Tests were fixed
Merge pull request #491 from nazariitashak/development

Issue #445 completed