faza de testare
Adaugat roluri
coafat
core
asd
asd
asd
Merge branch 'alex'

Conflicts:
	all/modules/custom/arg_bursa/arg_bursa.module
	all/modules/custom/arg_core/arg_core.module
	all/modules/custom/arg_facultate/arg_facultate.module
	all/modules/custom/arg_sesiune/arg_sesiune.module
	all/modules/custom/arg_universitate/arg_universitate.module
edit cu permisiuni pe toate content types
Campul Stare este functional.
Verificare completa la permisiuni. Exceptie creeare universitate?.
Adaugat linkuri intre noduri.
Implementat camp perioada in modulul Sesiune.
Merge branch 'master' of https://github.com/gsdata/arg.git

Conflicts:
	all/modules/custom/arg_bursa/arg_bursa.module
	all/modules/custom/arg_core/arg_core.module
	all/modules/custom/arg_facultate/arg_facultate.module
	all/modules/custom/arg_sesiune/arg_sesiune.module
	all/modules/custom/arg_universitate/arg_universitate.module
merge_manual
Merge branch 'master' of https://github.com/gsdata/arg.git

Conflicts:
	all/modules/custom/arg_bursa/arg_bursa.module
	all/modules/custom/arg_core/arg_core.module
	all/modules/custom/arg_facultate/arg_facultate.module
	all/modules/custom/arg_sesiune/arg_sesiune.module
logo fac si univ