Slider update
Merge branch 'master' of https://github.com/bobjutsu/bearded-batman

Conflicts:
	config.php