Fix errors with g++4.8
Merge branch 'master' of https://github.com/mdetect/mdetect

Conflicts:
	src/frameorganizer.cpp
	src/frameorganizer.h