rever details on design
Merge branch 'master' of https://github.com/IrinaPazargic/licenta

Conflicts:
	html/detalii_rezervare.php
	html/sumar.php
Merge branch 'master' of https://github.com/IrinaPazargic/licenta

Conflicts:
	html/detalii_rezervare.php
	html/sumar.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	html/register.php
	html/script/administrator.js