Interface update
Interface update
Interface update
Interface update
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/plugins/ckeditor/plugins/specialchar/dialogs/lang/id.js
	admin/plugins/ckeditor/plugins/specialchar/dialogs/lang/nb.js
	admin/plugins/ckeditor/plugins/specialchar/dialogs/lang/ug.js
	app/components/cart/component.php
	config.php
	core/init.php