++ autocomplete
++ add_form
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	application/controllers/lucrari.php
	application/models/retetemodel.php
	application/views/salveaza_reteta.php
	application/views/templates/header.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	application/views/salveaza_reteta.php
	application/views/templates/header.php
joi@mai.g:
++ name = medicamente[] ...