Merge branch 'master' of https://github.com/YJimenez/Junkyard

Conflicts:
	mvc/model/syndicasterModel.php
linea