Merge origin/master

Conflicts:
	application/controllers/emprestimo.php
	application/models/leitores_model.php
	application/views/emprestimo/forme_novo_emprestimo_item_view.php