merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/groups/views/edit.jade
Merge remote-tracking branch 'upstream/master'
move middleware function newUserMustFillInRegistration to members
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
Activated activities... :-)
rename method
export authencitation.secureByLogin
Committed files cannot be ignored; therefore added git update-index to prepublish script.
redirection tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
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