Merge branch 'master' of https://github.com/softwerkskammer/NeuePlattform-Implementierung into theme
Merge branch 'announcements' into theme
Test font-size for mobile version
Temporary fix for height of scroll areas
add charset for ical

this hopefully fixes the google.cal issue
minor refactoring & fix
Merge pull request #340 from leider/master

add charset for ical
Inhalt der 3. Seite ragt nicht mehr in Inhalt der 1. Seite
Merge pull request #342 from marcphilipp/landing-page-overflow-fix

Inhalt der 3. Seite ragt nicht mehr in Inhalt der 1. Seite
Merge branch 'master' of https://github.com/softwerkskammer/Agora into theme

Conflicts:
	public/stylesheets/screen.css
First steps for mobile CSS enhancements
Reduced line-height for list items
Delete file
Merge pull request #343 from fdeberle/theme

Theme: First steps for mobile CSS enhancements
Merge branch 'master' into wiki