Merge branch 'hotfix/BVV-636'
Merge branch 'develop'
Merge branch 'master' of github.com:cultuurnet/culturefeed
Add type to composer.json.
Needed for installer-paths support.
Merge branch 'develop'
Merge branch 'develop'
MSS-34
WKS-212 remove subject
Merge pull request #21 from Ozmodiar/installer-paths

Add type to composer.json.
Use correct variables for the display
WKS-240 Enable the deletion of user pictures
Merge branch 'feature/MSS-34' into develop
MSS-41
Merge branch 'feature/MSS-41' into develop
CF-340 ZIP-code not required anymore when not BE. Default value is '0000'
country fix
CF-341 Street and House Number when country is not BE
MDH-58 culturefeed_social not anymore dependent for related activities
Merge branch 'develop'
Merge branch 'hotfix/WKS-240'