Merge branch 'hotfix/CEP-524'
Merge branch 'develop'
refactored code for recommended by so it can be modified in tpl instead of framework.
Merge branch 'develop'
CEP-530 adding old_parts to city suggest
Fix PHP short tags usage
Add a link to the login page to the message shown when login is required to post a new comment
Refactor login link: add it to all messages that require user to login to perform action
Merge pull request #20 from svendecabooter/feature/comment-login-link

Add a link to the login page to the message shown when login is required...
Merge pull request #19 from svendecabooter/feature/php-short-tags

Fix PHP short tags usage
Merge branch 'master' into develop
CEP-530 trim city suggestion
WKS-218: Add filter on actortypes for autocomplete
CEP-574 add variable following on culturefeed page
Merge branch 'develop' of https://github.com/cultuurnet/culturefeed into develop
remove bootstrap modal markup from page members management
remove bootstrap markup from social activity management
Added blocks for users who attend and like an event.
small changes for CEP-518
fix for CEP-599 issue