button type="submit"
Merge branch 'master' of https://github.com/softwerkskammer/NeuePlattform-Implementierung into announcements
moved content of agora-print inside agora.css
Relaxed backend validation of email prefix.
move function valueOrFallback to lib/common/fieldHelpers.js
importMails.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/testbeans.json
Merge pull request #173 from dpolivaev/master

Kleine Anwendung um Mails in die Datenbank zu laden
Merge remote-tracking branch 'upstream/master'
Use latest winston-config version
Adopt log messages on log config errors
Relaxed checking of the email prefix in the frontend as well.
Merge pull request #174 from triplem/winston-config

Use latest winston-config version
corrected callback calling to inside
formatting only: insert blank
member's attributes weren't needed
member cleanup and more...

- nickname editable
- alternative layout for activities (check it out)
Merge remote-tracking branch 'upstream/master'
Merge pull request #175 from NicoleRauch/master

Prüfung des EMail Präfix für Gruppen erlaubt jetzt auch Leerzeichen und Bindestriche
Merge remote-tracking branch 'upstream/master'