Added an extra column for the mapping group-isactivated-user
also first usage of this new column
Merge branch 'develop-local'

Conflicts:
	src/Ethergroups/MainBundle/Entity/Groups.php
	src/Ethergroups/MainBundle/Entity/User.php
	src/Ethergroups/MainBundle/Resources/views/Default/index.html.twig
renamed notifiedGroups and notifiedUsers to groupsRequests and userRequests
Added possibility to accept or decline a request
Add a new user to the userrequest table and write a mail
gray out the group requests
better mail text + doc
Merge branch 'develop-local'
translation for the mailsubject
Merge branch 'develop-local'
Merge branch 'develop-local'
Merge branch 'develop-local'
Merge branch 'dev_rename_userEntity'

Conflicts:
	src/Ethergroups/MainBundle/Entity/Groups.php
	src/Ethergroups/MainBundle/Entity/Users.php
	src/Ethergroups/MainBundle/Resources/views/Default/index.html.twig
brach specific fixes for: Merge branch 'dev_rename_userEntity'
even more fixes for the merge
Merge branch 'dev_rename_userEntity'
Merge branch 'dev_updateComposer'
Merge branch 'dev_changeHeader'
FIX, user couldn't be added
Cleanup/improve code, new IDE: PHPStorm