18 ian dimineata
save add
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/IndexController.php
	application/controllers/UserController.php
	application/layouts/scripts/layout-page.phtml
	application/layouts/scripts/layout.phtml
	application/views/scripts/user/add.phtml
	application/views/scripts/user/index.phtml
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/IndexController.php
	application/controllers/UserController.php
	application/layouts/scripts/layout-page.phtml
	application/layouts/scripts/layout.phtml
	application/views/scripts/user/add.phtml
	application/views/scripts/user/index.phtml
modificari de pe stick
autentificare
autentificare
autentificare