done ver1
Merge branch 'dev' of github.com:lvl0nax/topaza_shop into layout_new_order

Conflicts:
	app/views/layouts/application.html.haml
little fix
fix
fix admin/order
Merge pull request #21 from Neodelf/layout_new_order

Layout new order