ldap (first commit)
Fixing ldap test.
Add comment when awarding badge
Comment when awarding badge is optionnal
Comment when awarding badge in workspace
Display awarding badge comment on profile badge page
Merge pull request #589 from solispauwels/master

Mail validator update
Merge branch 'master' into add_comment_when_awarding_badge

Conflicts:
	Controller/Administration/BadgeController.php
	Controller/Badge/Tool/WorkspaceController.php
	Manager/BadgeManager.php
Fixed warning in dev mode
Fixed checkbox bug
Inlined acl creation for legacy versions
Merge pull request #590 from stefk/fix-category-registration

Fix category registration bugs
Merge pull request #591 from stefk/legacy-updater

Inlined acl creation for legacy versions
Comment is optionnal as if not supply null value is good
Merge pull request #569 from maxailloud/add_comment_when_awarding_badge

Add comment when awarding badge
Remove portfolio link from user menu
Merge pull request #593 from maxailloud/remove_portfolio_link

Remove portfolio link from user menu
When no badge selected for claiming badge a warning message is show
Merge pull request #596 from maxailloud/fix_claiming_badge

When no badge selected for claiming badge a warning message is show
Fix typo