#150 Integracio a master
Merge branch 'master' of https://github.com/eloipuertas/ES2013Dijous into devel