added commenting blocks
Merge branch 'develop' into develop.refactor_generateTranslationProblem