merging
Merge branch 'master' of https://github.com/mikkofinell/Hegemon
fixed typo
removed unused std::map from dispatcher