te
Merge branch 'master' into rjCubeImageSlider

Conflicts:
	js/jquery.rjImageSlider.js