Merge branch 'hotfix/fix-answer-style'
updated django-mptt to 0.5.3
Merge branch 'master' into develop