- 
# Conflicts: # frontend/views/layouts/main.php
 - 
2)Поправил меню в шапке и active отображение
 
- 
# Conflicts: # frontend/views/site/contact.php # frontend/views/site/index.php
 - 
# Conflicts: # frontend/views/site/contact.php # frontend/views/site/index.php