* Ignore
* merge from master
* merge from master
* Ignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/static_accessories/config/module_config.php
	modules/static_accessories/controllers/install.php
	modules/static_accessories/views/widget_slide.php