[Issue #188] [MC] fixes merge conflicts with Projects_Theme
Merge pull request #329 from MGhanem/C1_khloud_C3S21_export_project_data

[Issue #188] [MC] fixes merge conflicts with Projects_Theme