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
Merge branch 'staging'
Merge pull request #74 from csirtgadgets/staging

bugfix for broken log4perl tests
changelog, depfix
Merge branch 'master' into develop

Conflicts:
	ChangeLog
bugfix to cif-workers not getting the msgs..
bugfixes to ping-write interface
Merge branch 'develop' into staging