Merge branch 'fix-locale-listener-priority' into 2.1
Merge branch 'fix-locale-listener-priority' into 2.1
Merge branch 'fix-locale-listener-priority' into 2.1
Upgrade the ckeditor, twitter bootstrap files and solve some IE bugs, merged from master branch
Merge branch 'master' into 2.1
fix the navbar css to work with templates that don't use twitter bootstrap
Merge branch 'fix-admin-navbar'