Merge branch 'develop' of github.com:divio/django-cms into develop
fixes the template validation if render_template is a callable
check property
Merge branch 'develop' of github.com:divio/django-cms into develop
Merge branch 'develop' into fix-call-template
Merge pull request #2630 from digi604/fix-call-template

Fix call template