Merge branch '17oct1215'
 comentarios
sprint 11
sprint 11
sprint 11
sprint 11
sprint 11
sprint 11
sprint 11
sprint 11
sprint 11 final final