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

Conflicts:
	_pendiente.txt
	temp/pet_magick_ALL-2014-03-08.sql