http://forge.taotesting.com/issues/3250
Merge branch 'develop' of git://github.com/oat-sa/tao-core into develop

Conflicts:
	views/css/tao-3.css
	views/css/tao-3.css.map