Merge branch 'hotfix/2.0.2'
Added files previously forgotten and changed LDAP server
Merge branch 'release/2.1.0'
Removed notion of subscriptions for activities since they are not yet implemented
Merge branch 'hotfix/2.1.1' into develop