Merge
Merge branch 'master' of https://github.com/CELAR/c-Eclipse.git