Petite modification
Merge branch 'master' of https://github.com/feecpp/imakart
Merge branch 'master' of https://github.com/feecpp/imakart

Conflicts:
	application/src/ContextManager.cpp