templates
Merge branch 'new-design' of git://github.com/oat-sa/tao-core into new-design

Conflicts:
	views/css/layout.css
	views/css/tao-3.css
	views/css/tao-main-style.css
	views/js/lib/jsTree/themes/css/style.css
	views/templates/blocks/sections.tpl
Merge branch 'new-design' of git://github.com/oat-sa/tao-core into new-design