Fixes BH-379 triangle_types
Fixes-366, telling_time_2
Merge branch 'translation' of https://github.com/PerceptumNL/KhanLatest into translation