Merge pull request #65 from csirtgadgets/staging

cif-workers
Merge pull request #69 from csirtgadgets/staging

misc bugfixes
Merge pull request #73 from csirtgadgets/develop

bugfix in smrt cache handling
bump
travis
travis
travis
Merge branch 'staging'
bugfix for broken log4perl tests
Merge pull request #74 from csirtgadgets/staging

bugfix for broken log4perl tests
Merge branch 'master' into develop

Conflicts:
	ChangeLog