[Issue #195][WIP] applied new code conventions
Merge branch 'word_management_theme' of https://github.com/MGhanem/smartsoft-13 into C4_NourhanMohamed_S12_advanced_search