[Reinhold]
modified css
Merge branch 'master' of https://github.com/ReSeSe-Gruppe7/Seapal

Conflicts:
	public/javascripts/app/ajax/weatherinfo.js