Add page basket and order table
Merge branch 'master' of https://github.com/KernelCorp/nika

Conflicts:
	source/layouts/layout.html.haml
	source/stylesheets/header.css.sass
Merge branch 'master' of https://github.com/KernelCorp/nika
Merge branch 'master' of https://github.com/KernelCorp/nika

Conflicts:
	source/layouts/layout.html.haml
	source/stylesheets/header.css.sass
Merge branch 'master' of https://github.com/KernelCorp/nika
fix container