increase es timeout
Add Article.exists function in batches, update articleset add, various small fixes
'fixed' html bzk uploader
escape html from api before passing to datatables
Merge branch 'release-3.3.2'