form criar medicamento
Merge remote-tracking branch 'origin/master'

Conflicts:
	clinics/protected/views/utentes/update.php
	clinics/themes/bootstrap/css/styles.css
form criar medicamento