merged with tema2 branch from repo core-upm/blog2012 and remote set to toniprada/blog/2012