commit
Merge branch 'master' of https://github.com/dvicenter/sis_biblio

Conflicts:
	application/views/v_panel.php