Report modal back button brings to unexpected place
Merge pull request #2372 from 810/feature-hmvc

3.1 Html fixes #2316 #2323
Merge pull request #2370 from xillibit/k31_bugs15

Report modal back button brings to unexpected place
Merge pull request #2373 from 810/feature-hmvc

K3.1 : fix undefined variable in category index  #2367
3.1 Crypsis: Fix merge issues