files
files
Merge branch 'master' of https://github.com/sbushinskii/tradeshop

Conflicts:
	application/controllers/admin.php
	application/controllers/site.php
	application/models/admin/admin_model.php
	application/models/related_sells_model.php
	application/models/sizes_model.php
	application/views/admin/admin_edit_order_view.php
	application/views/admin/admin_ticket_order_view.php
	application/views/description_popup.php
	application/views/header.php
	application/views/index.php
	css/style.css
	files/20131005125010.jpg
	files/20131005125021.jpg
	files/20131005125348.jpg
	files/20131005125444.jpg
	files/price/20131005125010.jpg
	files/price/20131005125021.jpg
	files/price/20131005125348.jpg
	files/price/20131005125444.jpg