Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/biblioteca-icg/theme.php