Merge branch 'hotfix-singlesystem-init'
Fixed GCC 4.7.2 build (Debian 7, Ubuntu 12.10...)

 - std::map::emplace() does not exist prior to GCC4.8 : using .insert(std::move()) instead
Merge branch 'feature-gcc-47' of https://github.com/SRombauts/libes into hotfix-from-SRombauts
Merge branch 'hotfix-from-SRombauts' into develop