changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/pages/slider.html
services