#267
Merge branch 'devel-C-D' of https://github.com/eloipuertas/ES2013Dijous into devel-C-D