some style changes & initTypes() function
Merge branch 'master' of github.com:JulianKunkel/siox

Conflicts:
	src/knowledge/optimizer/plugins/generic-history/GenericHistory.cpp
Merge branch 'master' of github.com:JulianKunkel/siox
fixed siox not building with anything other than gcc-4.7