Update
Adaugat si Program Studiu
Reparat ceva prostii pe care le-o facut Alex cand s-o grabit sa faca baza de date. Si alte prostii pe care le-o facut Razvan cand o facut el ce o facut
Update
Update
Merge remote-tracking branch 'upstream/orar' into extends

Conflicts:
	rms/application_admin.py
Adaugat obtinerea de proiecte si resurse
Merge branch 'master' into extends

Conflicts:
	model-data.sqlite
	rms/Model/Activitate.py
	rms/Public/CalendarActivitati.py
	rms/Public/ProiecteDepartament.py
	rms/Public/ResurseDepartament.py
	rms/application_admin.py
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	rms/Model/Activitate.py
	rms/application_admin.py
Merge remote-tracking branch 'remotes/upstream/reparatii'
Modificari
Merge remote-tracking branch 'upstream/reparatii'

Conflicts:
	rms/Model/Activitate.py
	rms/application_admin.py
Adaugat Obtirea de Resurse si Proiecte
Adaugat Obtinerea de resurse si proiecte
Sters model-data
Reparatii
Am facut cu OpenTableModel
Am facut cu OpenTableModel
Am facut cu OpenTableView
Merge pull request #21 from alexand7u/master

Am adaugat obtinerea de resurse si proiecte