removed last merge and remerged
Merge remote-tracking branch 'origin/default-theme' into default-theme

Conflicts:
	classes/context/Context.class.php
	classes/db/DB.class.php
	classes/db/DBCubrid.class.php
	classes/db/DBFirebird.class.php
	classes/db/DBMssql.class.php
	classes/db/DBMysql.class.php
	classes/db/DBMysql_innodb.class.php
	classes/db/DBMysqli.class.php
	classes/db/DBMysqlpdo.class.php
	classes/db/DBPostgresql.class.php
	classes/db/DBSqlite3_pdo.class.php
	classes/display/DisplayHandler.class.php
	classes/module/ModuleHandler.class.php
	classes/template/TemplateHandler.class.php
	composer.json
	config/config.inc.php
	layouts/bootstrap/css/style.css
	layouts/bootstrap/layout.html
	modules/debug/DependencyInjection/Configuration.php
	modules/debug/EventListener/DBQueryInfoListener.php
	modules/debug/EventListener/DebugToolbarListener.php
	modules/debug/EventListener/QueryErrorListener.php
	modules/debug/EventListener/ResponseSummaryInfoListener.php
	modules/debug/EventListener/SlowQueryListener.php
	modules/debug/tpl/css/styles.css
	modules/debug/tpl/failed_queries.html
	modules/debug/tpl/js/scripts.js
	modules/debug/tpl/php_errors.html
	modules/debug/tpl/toolbar.html
	modules/editor/skins/ckeditor/js/xe_interface.js
	modules/member/member.admin.view.php
	modules/member/tpl/insert_member.html
	modules/member/tpl/member_config.html
	modules/page/page.view.php
	modules/page/tpl/page_content_modify.html
	modules/widget/tpl/add_content_widget.html
	modules/widget/tpl/css/widget.css
	modules/widget/tpl/js/widget.js
	src/Karybu/Event/ErrorEvent.php
	src/Karybu/Event/QueryEvent.php
	src/Karybu/EventListener/CMSListener.php
	src/Karybu/EventListener/ErrorHandler.php
	src/Karybu/EventListener/ExceptionHandler.php
	src/Karybu/EventListener/RouterListener.php
	src/Karybu/Exception/DBConnectionFailedException.php
	src/Karybu/HttpKernel/Controller/ControllerResolver.php
	src/Karybu/HttpKernel/HttpKernel.php
	src/Karybu/ModuleHandler/ModuleInfoResult.php
	tests/classes/context/ContextInstanceTest.php
	tests/phpunit.xml
	tests/src/GlCMS/EventListener/CMSListenerTest.php
Revert "Merge branch 'master' into default-theme"

This reverts commit 1036d60ecbe4f2887a9a98b0ce77cc9eb56c797e, reversing
changes made to e7526e35d56c52718d9f4b0c2f1aa3c231b51bd1.
Revert "removed last merge and remerged"

This reverts commit 246e6710fa7db9b4af7d299be8103944d8ccb9e3.