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