вёрстка на project-stub
box
перекладываем на enb
markup merging
Merge branch 'markup-stub' into markup-merged

* markup-stub:
  markup merging
  перекладываем на enb
  box
  вёрстка на project-stub

Conflicts:
	bem/desktop.blocks/catalog/catalog.css
	bem/desktop.blocks/legend/legend.css
	bem/desktop.bundles/index/index.bemjson.js
Fixing branch after merging to ensure bem-tools working
some unfinished
Merge branch 'master' of github.com:smart-bem/smart-bem

* 'master' of github.com:smart-bem/smart-bem:
  added navigator to build, added cmd run enb server
  added bind navigation on document.body
  copy past navigation object
  fixed package.json
  added cmd 'npm run make' for call 'end make' without install enb to global
  added layer tv-pc.blocks
  update example vcl, test insert logo :)
  added bl player
  added navigation bl, and keymap bl
  added functions play, stop, adddplaylist, clear playlist, get state
  added image bem for logo on video
  update player readme, and create player.js
  update .gitignore fix enb, bower for ubuntu
  update example vlc.html
  не подключаются стили библиотек bem-components :(
  не подключаются стили библиотек bem-components :(
  не подключаются стили :(
  first commit

Conflicts:
	bem/desktop.bundles/index/index.bemjson.js
sucrifice
upd bower+bem-components
fixup enb build
items.bemhtml to bh
панель legend
fix bem make (yolo)
панель legend
Merge branch 'markup-stub' of github.com:smart-bem/smart-bem into markup-stub

* 'markup-stub' of github.com:smart-bem/smart-bem:
  панель legend
  панель legend
mv to ./bem
Merge branch 'markup-stub'

* markup-stub:
  mv to ./bem
  панель legend
  панель legend

Conflicts:
	bem/desktop.bundles/index/index.bemjson.js
padding
fixup making on win