merge master
merge master

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