added Picarol exclusiu
added Ferran's question
Merge remote-tracking branch 'upstream/master'