cleanup
update diqus code
Merge branch 'refs/heads/development' into gh-pages