Fix issue #2042 - import sample content and fix php warning
Merge branch 'develop' of github.com:meedan/meedan-checkdesk into develop