dscjsbdljhc,DA
Merge remote-tracking branch 'AulApp/master'

Conflicts:
	aule_prenota.php