prepare bullets
prepare bullets
Merge branch 'refs/heads/Bullets'

Conflicts:
	demo/index.html
	themes/default/yerslider-styles.css