Restructuring of slides module
Merge branch 'master' into squares

Conflicts:
	src/slides/slides.js