Merge pull request #478 from NicoleRauch/master

Anzeigen einer Aktivität aufgeräumt
1st step in centralizing userrights
2nd step in centralizing userrights
- additionally deleted strange tests
3rd step in centralizing userrights
- almost everywhere removed the user form jade files -> now using req.user instead of res.locals.user
- login menu left
if there is no user we don't complain
Merge pull request #480 from leider/master

centralizing userrights
Fix for #481. It was introduced by the ability to use more than one authentication service
Merge pull request #482 from leider/master

Fix for #481. It was introduced by the ability to use more than one auth...
Better use the correct comparison operator...
Always use all resources (probably part 1), and use a function for the default resource name.
fixed layout-bug introduced by bootstrap 3.0
Resources.fillFromUI must be able to work with empty resources - no matter what the object says about previous resources.
Don't show the resource name when there is only one resource.
housekeeping - new versions of bootstrap and font awesome
small UI change
Merge pull request #483 from leider/master

UI-stuff (layout changes, housekeeping)
Merge commit 'f75cfed507ad940c0de039448c668ec5ad755e83' into limited-activities

Conflicts:
	lib/activities/views/get.jade
Fixed selection display bug in calendar
Merge pull request #484 from leider/master

Fixed selection display bug in calendar
The default resource is now called "Teilnehmer".