refactoring
last refactoring changes
refactoring
merge with site
last commit before merge
changes for merge to dev
Merge pull request #15 from 3104-project-team/refactoring

Refactoring