Added GenericHistoryPlugin to build lists; test for this currently crashes!
Merge branch 'master' of github.com:JulianKunkel/siox

Conflicts:
	tools/CMakeLists.txt