Slider für die Zeit
Merge branch 'master' of https://github.com/bluemoep/LocalTwitter

Conflicts:
	WebContent/css/all.css