Merge branch 'master' into AC-026/14
override defeault.settings to 7.26
style sub categories for publications
adjust french menu padding
add new logo
add script for french side logo
increase publication text size
install ckeditor lib
update colorbox lib
update colorbox lib
Revert 0a8a9f0..2471d14

This rolls back to commit 0a8a9f07ec5c879e3a120e3b8c42efbfed785229.
install i18nviews
Revert "install i18nviews"

This reverts commit 849dec1d9a302cd5622e2049bd093564e42d9d28.
apply patch to make ckeditor work on translated blocks
update default.settings.php
Merge branch 'AC-026/14'