all project commited and pushed
Merge remote-tracking branch 'origin/master'

Conflicts:
	html/.idea/jsLibraryMappings.xml
	html/operatii_sali.php