pathes have been changed
Merge remote-tracking branch 'origin/master'

Conflicts:
	catalog/vintovoy/index.html
Merge remote-tracking branch 'origin/master'
some changes
two additional locker
from custom to bootstrap