Merge pull request #1 from NovikovViktor/dev

First merge Dev to Master
Merge pull request #2 from NovikovViktor/dev

Dev
new machine
Merge branch 'dev' of https://github.com/NovikovViktor/OnTheWay into dev
changing including scripts in template