add default cm logo
add basic style guide
Merge branch 'master' of github.com:cargomedia/CM into issue-1013
merge
Merge branch 'master' of github.com:cargomedia/CM into issue-1013
fix merge
Merge branch 'master' of github.com:cargomedia/CM into issue-1013
add smarty block.box plugin
Revert "add smarty block.box plugin"

This reverts commit eea5451ed68c15293e8ae03349310e4df1b711ac.
delete box.less
use simple divs instead of {box}
Merge branch 'master' of github.com:cargomedia/CM into issue-1013
Merge pull request #1013 from christopheschwyzer/issue-1013

Extend example