Organized StateStack.h a bit
Le merge