Fixed tasks.py imports
Merge branch 'dev' of github.com:amcat/amcat into dev