Slider color
Merge branch 'master' of https://github.com/jsiochi/MapStoryComposer

Conflicts:
	storylayers.html