Slider
Merge branch 'master' of github.com:dinox/fsek

Conflicts:
	app/views/layouts/application.html.erb