Merge pull request #583 from Tekashi/master

Teilnehmerliste für jede Ressource
Moved pure persistence test to its own file and made it independent from Activities.
Bugfix: Activity.fillFromUI must not change the ID of the activity.
TestHelper now accepts beans as parameter. This is required for database tests.
Concurrency test and adaption for activities index.
Removed unnecessary line.
Merge pull request #584 from NicoleRauch/master

Versions-Konflikt-Behandlung beim Speichern einer Activity
Added error message when redirecting to activities/edit
do not print avatar images in member list
override bootstrap’s idea of printing <a> tags
Merge pull request #585 from leider/master

Fix printing memberlist
replaced grunt-recess by grunt-contrib-less in order to prepare for new bootstrap version
Addtition to: replaced grunt-recess by grunt-contrib-less in order to prepare for new bootstrap version
- updated batch file
Merge commit '8c77c61e6c34f6a9a67cca215176f48d18238c01'
Now we get a 500 when git is not installed. This fixes Bug #581.
changed jade files to avoid | symbols for multiline paragraphs and similar
now using bootstrap 3.1 - some adoptions have been necessary
Merge pull request #587 from leider/master

Bootstrap 3.1
updated query to 2.x -> old IE will not work anymore
massive update for jquery.mockjax for frontend tests