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
cleanup the sass files
added documentation
Merge remote-tracking branch 'upstream/master'
Adapted the README to new name.

Introduced link to backlog
Link to hangout included
Merge pull request #311 from leider/master

cleanup the sass files
Fixing timezone problem in ical files

Initial 1st hotfix. - Further work to be done
Added comment to clarify intention
Renaming to Agora in package.json
Merge pull request #319 from fdeberle/develop

Renaming to Agora in package.json
Merge remote-tracking branch 'upstream/master' into wiki
replaced 'moment' by 'moment-timezone'

You should update your node-module. Delete 'mongo' and 'mongo-timezone'
and do 'npm install'
Number of groups displayed now

for enhancement #315
removed special color from badges
Merge pull request #318 from leider/wiki

Fixing timezone problem in ical files
Merge remote-tracking branch 'upstream/master'