#228 solved
preparing to merge
Merge branch 'devel-E' of https://github.com/eloipuertas/ES2013Dijous into devel-E-rc