Fixes BH-388
Fixes BH-390
Fixes BH-396
Fixes BH-399
Fixes BH-395
Fixes BH-398
Fixes BH-385
Fixes BH-403
little change (not on BH)
Fixes BH-404
Merge branch 'translation' of https://github.com/PerceptumNL/KhanLatest into translation