fixed scraping_check
Merge branch 'master' of https://github.com/amcat/amcat
daily fix
Merge branch 'master' of https://github.com/amcat/amcat
elastic initialization to work with empty database
hits column in search results
AMCAT-1 #comment silly commit to test JIRA integration
added .amcat.nl to allowed hosts, removed uuid log middleware
Merge branch 'master' of https://github.com/amcat/amcat
add log messages  to refresh
Merge branch 'master' of github.com:amcat/amcat
pushed in script import to avoid cycle (but this breaks the test, so the test code should probably move to a different module?)
Update medium mapping to fix problem with broken uip medium names in aggregate
update to proper search parameter (see https://github.com/elasticsearch/elasticsearch-py/issues/13)
fixed articleset refresh bug for large sets
Merge branch 'master' of https://github.com/amcat/amcat
CB_TYPE undefined when calling _getFieldObj. Removed (debug?) print statement.
Issue #621: Implemented keyboard shortcuts for "irrelevant & continue" and "Finish & continue".
Merge remote-tracking branch 'origin/master'
moved search query parsing to keywordsearch