Working model
Merge branch 'curvy-slider-test' into slider-improvements

Conflicts:
	public/scripts/curvy-slider-test.js
Merge branch 'slider-improvements' into curvy-slider-test