Nu mai stiu ce schimbari
Merge remote-tracking branch 'upstream/reparatii'

Conflicts:
	rms/Model/Activitate.py
	rms/application_admin.py