ajustes
Merge branch 'master' of https://github.com/jelicich/pet-magick

Conflicts:
	php/classes/models/BlogsTable.php
	php/classes/models/VetTalkTable.php
	php/classes/models/VideosTable.php
conflictssss