Merge branch 'development' of github.com:ding2tal/ding_content into development