fixed merge wuth master
fixed merge wuth master

jankkhvej/platform-application,orocrm/platform-application,EugenZi/oro-platform-app,vshabala/academic,olegmack/oro-academic,devXpro/OROBug,kos21/RADOROPlatform,cbradescu/orotlt,cbradescu/deranjamente,cbradescu/orotlt,vetal-e/academic_platform,DMKEBUSINESSGMBH/adoro,vshabala/academic,kos21/RADOROPlatform,jankkhvej/platform-application,orocrm/platform-application,devXpro/OROBug,vetal-e/academic_platform,cbradescu/deranjamente,cbradescu/deranjamente,vetal-e/academic_platform,cbradescu/orotlt