slider
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php
	static/css/compiled/main.css
	static/css/less/main.less