merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/groups/views/edit.jade
Merge remote-tracking branch 'upstream/master'
Activated activities... :-)
Committed files cannot be ignored; therefore added git update-index to prepublish script.
1st part of admin functionality
merge
Merge remote-tracking branch 'upstream/master'
Merge pull request #100 from dpolivaev/master

Some first redirection tests
merged Dimitrys changes
Merge pull request #99 from NicoleRauch/master

Dies & Das
merge
Merge remote-tracking branch 'upstream/master'
small fix in redirecting
minor fix
activities tweaking and editing
extracted configuration for testability
config extract
groups administration
minor fix
regex was bad
test runs again