Merge origin/master

Conflicts:
	application/models/utils/moneda.php
Merge origin/master

Conflicts:
	application/models/utils/moneda.php
Merge origin/master

Conflicts:
	application/views/include/head.php