Merge branch 'devel-C-D' of https://github.com/eloipuertas/ES2013Dijous into devel-C-D
#147 Integracio de #169 i #170 a Unity. NO ENTRA A SP3