Edits for V. 1.2
Merge branch 'edit' of github.com:vividJS/vividSlider into edit

Conflicts:
	demo/site/defaultSlider.html
	js/jquery-vividSlider.js