new sliders!
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/picsma.ui.js