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

Conflicts:
	views/js/layout/section-height.js
	views/js/uiBootstrap.js
	views/scss/tao-3.scss
	views/templates/blocks/sections.tpl