mapa
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/Reader/Data.php
	library/Api/Engine.php