:Scripts rearranged
Issue #318 fixed
Merge remote-tracking branch 'upstream/development' into development
merge with development
Issue #563 fixed
Unused views removed
Merge pull request #561 from Bohdan-Tereta/development

Issue #318, 563, 564 fixed