agregando numero de paginas
Merge branch 'master' of https://github.com/alejandroPardo/lacloMAG
Merge branch 'master' of https://github.com/alejandroPardo/lacloMAG

Conflicts:
	app/Controller/MagazinesController.php
Merge branch 'master' of https://github.com/alejandroPardo/lacloMAG