12.coordenades: incooure camps
Merge  branch '12.coordenades'

Conflicts:
	fuel/app/logs/2014/06/02.php
	fuel/app/logs/2014/06/03.php
	fuel/app/logs/2014/06/04.php
	public/assets/img/cellers/plaza.mp3
	public/assets/img/cellers/plaza.ogg