finansovii block na all products
Vasilian kos9k
Merge branch 'dev'

Conflicts:
	protected/migrations/m140324_142828_add_column_kp.php
Edit migration
Merge branch 'dev'

Conflicts:
	protected/migrations/m140324_142828_add_column_kp.php
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	protected/migrations/m140324_142828_add_column_kp.php
dannie dlya pruduct_info
Merge branch 'dev'
Array edit product_info
Merge branch 'dev'
arrays products info
Merge branch 'dev'
product_info all array
Merge remote-tracking branch 'origin/dev' into dev
Edit samara filial