Merge branch 'master' into announcements
Merge branch 'master' of https://github.com/softwerkskammer/NeuePlattform-Implementierung into announcements
Merge branch 'theme' into announcements
Improved tests for announcements
Fuck you, unix timestamp
Merge branch 'master' of https://github.com/softwerkskammer/NeuePlattform-Implementierung into announcements
refactor mailThread.js
try to avoid Maximum call stack size exceeded error
Merge branch 'master' of git://github.com/softwerkskammer/NeuePlattform-Implementierung
Hotfix for groups/new

Didn't render anymore. Fixed
Merge pull request #245 from dpolivaev/master

refactor mailThread.js, try to prevent Maximum call stack size exceeded error
Merge pull request #246 from leider/master

Closing issue 224
Merge pull request #247 from leider/admin-list

Admin list
Minor UI Pimp for the Adminpages
delete unused code
Merge remote-tracking branch 'upstream/master'
name change for admin list
Merge pull request #250 from leider/master

neue verwaltung
Activities now remember their participants after an edit
Merge pull request #251 from leider/master

Bugfix for activities
EMail is now being sent with a Softwerkskammer sender and with the real sender in the Reply-To.