edit
Merge branch 'edit' of github.com-tbl123:vividJS/vividSlider into edit

Conflicts:
	demo/templates/tiledBgSlider.html
	js/jquery-vividSlider.js