merge master
merge master

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