Merge
Merge branch 'dev' of https://github.com/genericsystem/genericsystem2014.git into dev
Merge branch 'dev' of https://github.com/genericsystem/genericsystem2014.git into dev
Merge branch 'dev' of https://github.com/genericsystem/genericsystem2014.git into dev
clean code
Merge branch 'dev' of https://github.com/genericsystem/genericsystem2014.git into dev
add check when not the same engine
Merge remote-tracking branch 'origin/dev' into erik
clean tests in concurrency
Merge remote-tracking branch 'origin/erik' into dev