fixed timeout on slideshow
added additional timeout on slideshow
Merge branch 'master' of ssh://github.com/avondohren/a2gretna

Conflicts:
	app/views/pages/home.html.erb
added xmas eve slide