Ticket #3376
Merge branch 'develop' of github.com:/meedan/checkdesk into develop