refactoring
Merge branch 'Development' of github.com:ArtemZag/academy13 into Development
refactoring