Merge branch 'master' of E:\Florin\Facultate\Anul 2\Sem 4\Proiect colectiv\AuroraBuild224 with conflicts.
[PM-GUI] CadruDidactic
      - propuneri proiecte (varianta finala)
      - calendar activitati (varianta finala)