no funciona excel programas, datos en 0
Merge branch 'master' of https://github.com/camilo255423/ModuloInformes

Conflicts:
	target/scala-2.10/classes/controllers/Informe1.class
	target/scala-2.10/classes/controllers/Informe2.class
	target/scala-2.10/classes/controllers/Informe3.class
	target/scala-2.10/classes/controllers/Informe4.class
	target/scala-2.10/classes/controllers/Informe5.class
	target/scala-2.10/classes/views/html/informes/informefinal$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/informes/informefinal$$anonfun$apply$1.class
	target/scala-2.10/src_managed/main/views/html/informes/informefinal.template.scala
overwrite class
Merge branch 'master' of https://github.com/camilo255423/ModuloInformes

Conflicts:
	project/Build.scala~
	project/target/scala-2.9.2/sbt-0.12/classes/ApplicationBuild$.class
	target/scala-2.10/classes/Routes$$anonfun$documentation$1.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$1.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$10.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$11.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$12.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$13.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$14.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$15.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$16.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$17.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$18.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$19.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$2.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$20.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$21.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$22.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$23.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$24$$anonfun$apply$24.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$24.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$3.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$4.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$5.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$6.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$7.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$8.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1$$anonfun$applyOrElse$9.class
	target/scala-2.10/classes/Routes$$anonfun$routes$1.class
	target/scala-2.10/classes/Routes$.class
	target/scala-2.10/classes/Routes.class
	target/scala-2.10/classes/controllers/ReverseApplication.class
	target/scala-2.10/classes/controllers/ReverseAssets.class
	target/scala-2.10/classes/controllers/ReverseInforme1.class
	target/scala-2.10/classes/controllers/ReverseInforme2.class
	target/scala-2.10/classes/controllers/ReverseInforme3.class
	target/scala-2.10/classes/controllers/ReverseInforme4.class
	target/scala-2.10/classes/controllers/ReverseInforme5.class
	target/scala-2.10/classes/controllers/ReverseInforme6.class
	target/scala-2.10/classes/controllers/javascript/ReverseApplication.class
	target/scala-2.10/classes/controllers/javascript/ReverseAssets.class
	target/scala-2.10/classes/controllers/javascript/ReverseInforme1.class
	target/scala-2.10/classes/controllers/javascript/ReverseInforme2.class
	target/scala-2.10/classes/controllers/javascript/ReverseInforme3.class
	target/scala-2.10/classes/controllers/javascript/ReverseInforme4.class
	target/scala-2.10/classes/controllers/javascript/ReverseInforme5.class
	target/scala-2.10/classes/controllers/javascript/ReverseInforme6.class
	target/scala-2.10/classes/controllers/ref/ReverseApplication$$anonfun$cambioSemestre$1.class
	target/scala-2.10/classes/controllers/ref/ReverseApplication$$anonfun$index$1.class
	target/scala-2.10/classes/controllers/ref/ReverseApplication$$anonfun$prueba$1.class
	target/scala-2.10/classes/controllers/ref/ReverseApplication.class
	target/scala-2.10/classes/controllers/ref/ReverseAssets$$anonfun$at$1.class
	target/scala-2.10/classes/controllers/ref/ReverseAssets.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme1$$anonfun$excel$2.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme1$$anonfun$informeProfesor$1.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme1$$anonfun$pdf$2.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme1.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme2$$anonfun$excel$6.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme2$$anonfun$informeProfesor$3.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme2$$anonfun$pdf$6.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme2.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme3$$anonfun$excel$5.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme3$$anonfun$informeProfesor$2.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme3$$anonfun$pdf$5.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme3.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme4$$anonfun$excel$3.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme4$$anonfun$informeFacultad$1.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme4$$anonfun$pdf$3.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme4.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme5$$anonfun$excel$1.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme5$$anonfun$informePrograma$1.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme5$$anonfun$pdf$1.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme5.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme6$$anonfun$excel$4.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme6$$anonfun$informeParticipantes$1.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme6$$anonfun$pdf$4.class
	target/scala-2.10/classes/controllers/ref/ReverseInforme6.class
	target/scala-2.10/classes/views/html/index$.class
	target/scala-2.10/classes/views/html/index.class
	target/scala-2.10/classes/views/html/informes/informedocencia$.class
	target/scala-2.10/classes/views/html/informes/informedocencia.class
	target/scala-2.10/classes/views/html/informes/informefacultad$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/informes/informefacultad$.class
	target/scala-2.10/classes/views/html/informes/informefacultad.class
	target/scala-2.10/classes/views/html/informes/informefinal$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/informes/informefinal$.class
	target/scala-2.10/classes/views/html/informes/informefinal.class
	target/scala-2.10/classes/views/html/informes/informeheteroevaluacion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3.class
	target/scala-2.10/classes/views/html/informes/informeheteroevaluacion$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes/views/html/informes/informeheteroevaluacion$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/informes/informeheteroevaluacion$$anonfun$apply$10$$anonfun$apply$11.class
	target/scala-2.10/classes/views/html/informes/informeheteroevaluacion$$anonfun$apply$10.class
	target/scala-2.10/classes/views/html/informes/informeheteroevaluacion$$anonfun$apply$12$$anonfun$apply$13.class
	target/scala-2.10/classes/views/html/informes/informeheteroevaluacion$$anonfun$apply$12.class
	target/scala-2.10/classes/views/html/informes/informeheteroevaluacion$$anonfun$apply$4$$anonfun$apply$5$$anonfun$apply$6.class
	target/scala-2.10/classes/views/html/informes/informeheteroevaluacion$$anonfun$apply$4$$anonfun$apply$5.class
	target/scala-2.10/classes/views/html/informes/informeheteroevaluacion$$anonfun$apply$4.class
	target/scala-2.10/classes/views/html/informes/informeheteroevaluacion$$anonfun$apply$7$$anonfun$apply$8$$anonfun$apply$9.class
	target/scala-2.10/classes/views/html/informes/informeheteroevaluacion$$anonfun$apply$7$$anonfun$apply$8.class
	target/scala-2.10/classes/views/html/informes/informeheteroevaluacion$$anonfun$apply$7.class
	target/scala-2.10/classes/views/html/informes/informeheteroevaluacion$.class
	target/scala-2.10/classes/views/html/informes/informeheteroevaluacion.class
	target/scala-2.10/classes/views/html/informes/informeparticipantes$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes/views/html/informes/informeparticipantes$$anonfun$apply$1$$anonfun$apply$3.class
	target/scala-2.10/classes/views/html/informes/informeparticipantes$$anonfun$apply$1$$anonfun$apply$4.class
	target/scala-2.10/classes/views/html/informes/informeparticipantes$$anonfun$apply$1$$anonfun$apply$5.class
	target/scala-2.10/classes/views/html/informes/informeparticipantes$$anonfun$apply$1$$anonfun$apply$6.class
	target/scala-2.10/classes/views/html/informes/informeparticipantes$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/informes/informeparticipantes$.class
	target/scala-2.10/classes/views/html/informes/informeparticipantes.class
	target/scala-2.10/classes/views/html/informes/informeprofesor$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes/views/html/informes/informeprofesor$$anonfun$apply$1$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.10/classes/views/html/informes/informeprofesor$$anonfun$apply$1$$anonfun$apply$3.class
	target/scala-2.10/classes/views/html/informes/informeprofesor$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/informes/informeprofesor$.class
	target/scala-2.10/classes/views/html/informes/informeprofesor.class
	target/scala-2.10/classes/views/html/informes/informeprograma$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/informes/informeprograma$.class
	target/scala-2.10/classes/views/html/informes/informeprograma.class
	target/scala-2.10/classes/views/html/informes/tabladocencia$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3$$anonfun$apply$4$$anonfun$apply$5.class
	target/scala-2.10/classes/views/html/informes/tabladocencia$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.10/classes/views/html/informes/tabladocencia$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3.class
	target/scala-2.10/classes/views/html/informes/tabladocencia$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes/views/html/informes/tabladocencia$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/informes/tabladocencia$.class
	target/scala-2.10/classes/views/html/informes/tabladocencia.class
	target/scala-2.10/classes/views/html/informes/tablagestion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.10/classes/views/html/informes/tablagestion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3.class
	target/scala-2.10/classes/views/html/informes/tablagestion$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes/views/html/informes/tablagestion$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/informes/tablagestion$.class
	target/scala-2.10/classes/views/html/informes/tablagestion.class
	target/scala-2.10/classes/views/html/informes/tablainvestigacion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.10/classes/views/html/informes/tablainvestigacion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3.class
	target/scala-2.10/classes/views/html/informes/tablainvestigacion$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes/views/html/informes/tablainvestigacion$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/informes/tablainvestigacion$.class
	target/scala-2.10/classes/views/html/informes/tablainvestigacion.class
	target/scala-2.10/classes/views/html/lista$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/lista$.class
	target/scala-2.10/classes/views/html/lista.class
	target/scala-2.10/classes/views/html/listafacultades$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/listafacultades$.class
	target/scala-2.10/classes/views/html/listafacultades.class
	target/scala-2.10/classes/views/html/listainformes$.class
	target/scala-2.10/classes/views/html/listainformes.class
	target/scala-2.10/classes/views/html/listaprogramas$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/listaprogramas$.class
	target/scala-2.10/classes/views/html/listaprogramas.class
	target/scala-2.10/classes/views/html/listasemestres$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/listasemestres$.class
	target/scala-2.10/classes/views/html/listasemestres.class
	target/scala-2.10/classes/views/html/main$.class
	target/scala-2.10/classes/views/html/main.class
	target/scala-2.10/classes/views/html/mainmenu$.class
	target/scala-2.10/classes/views/html/mainmenu.class
	target/scala-2.10/classes/views/html/pdf/informedocencia$.class
	target/scala-2.10/classes/views/html/pdf/informedocencia.class
	target/scala-2.10/classes/views/html/pdf/informefacultad$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/pdf/informefacultad$.class
	target/scala-2.10/classes/views/html/pdf/informefacultad.class
	target/scala-2.10/classes/views/html/pdf/informefinal$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/pdf/informefinal$.class
	target/scala-2.10/classes/views/html/pdf/informefinal.class
	target/scala-2.10/classes/views/html/pdf/informeheteroevaluacion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3.class
	target/scala-2.10/classes/views/html/pdf/informeheteroevaluacion$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes/views/html/pdf/informeheteroevaluacion$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/pdf/informeheteroevaluacion$$anonfun$apply$10$$anonfun$apply$11.class
	target/scala-2.10/classes/views/html/pdf/informeheteroevaluacion$$anonfun$apply$10.class
	target/scala-2.10/classes/views/html/pdf/informeheteroevaluacion$$anonfun$apply$12$$anonfun$apply$13.class
	target/scala-2.10/classes/views/html/pdf/informeheteroevaluacion$$anonfun$apply$12.class
	target/scala-2.10/classes/views/html/pdf/informeheteroevaluacion$$anonfun$apply$4$$anonfun$apply$5$$anonfun$apply$6.class
	target/scala-2.10/classes/views/html/pdf/informeheteroevaluacion$$anonfun$apply$4$$anonfun$apply$5.class
	target/scala-2.10/classes/views/html/pdf/informeheteroevaluacion$$anonfun$apply$4.class
	target/scala-2.10/classes/views/html/pdf/informeheteroevaluacion$$anonfun$apply$7$$anonfun$apply$8$$anonfun$apply$9.class
	target/scala-2.10/classes/views/html/pdf/informeheteroevaluacion$$anonfun$apply$7$$anonfun$apply$8.class
	target/scala-2.10/classes/views/html/pdf/informeheteroevaluacion$$anonfun$apply$7.class
	target/scala-2.10/classes/views/html/pdf/informeheteroevaluacion$.class
	target/scala-2.10/classes/views/html/pdf/informeheteroevaluacion.class
	target/scala-2.10/classes/views/html/pdf/informeparticipantes$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes/views/html/pdf/informeparticipantes$$anonfun$apply$1$$anonfun$apply$3.class
	target/scala-2.10/classes/views/html/pdf/informeparticipantes$$anonfun$apply$1$$anonfun$apply$4.class
	target/scala-2.10/classes/views/html/pdf/informeparticipantes$$anonfun$apply$1$$anonfun$apply$5.class
	target/scala-2.10/classes/views/html/pdf/informeparticipantes$$anonfun$apply$1$$anonfun$apply$6.class
	target/scala-2.10/classes/views/html/pdf/informeparticipantes$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/pdf/informeparticipantes$.class
	target/scala-2.10/classes/views/html/pdf/informeparticipantes.class
	target/scala-2.10/classes/views/html/pdf/informeprofesor$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes/views/html/pdf/informeprofesor$$anonfun$apply$1$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.10/classes/views/html/pdf/informeprofesor$$anonfun$apply$1$$anonfun$apply$3.class
	target/scala-2.10/classes/views/html/pdf/informeprofesor$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/pdf/informeprofesor$.class
	target/scala-2.10/classes/views/html/pdf/informeprofesor.class
	target/scala-2.10/classes/views/html/pdf/informeprograma$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/pdf/informeprograma$.class
	target/scala-2.10/classes/views/html/pdf/informeprograma.class
	target/scala-2.10/classes/views/html/pdf/tabladocencia$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3$$anonfun$apply$4$$anonfun$apply$5.class
	target/scala-2.10/classes/views/html/pdf/tabladocencia$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.10/classes/views/html/pdf/tabladocencia$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3.class
	target/scala-2.10/classes/views/html/pdf/tabladocencia$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes/views/html/pdf/tabladocencia$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/pdf/tabladocencia$.class
	target/scala-2.10/classes/views/html/pdf/tabladocencia.class
	target/scala-2.10/classes/views/html/pdf/tablagestion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.10/classes/views/html/pdf/tablagestion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3.class
	target/scala-2.10/classes/views/html/pdf/tablagestion$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes/views/html/pdf/tablagestion$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/pdf/tablagestion$.class
	target/scala-2.10/classes/views/html/pdf/tablagestion.class
	target/scala-2.10/classes/views/html/pdf/tablainvestigacion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.10/classes/views/html/pdf/tablainvestigacion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3.class
	target/scala-2.10/classes/views/html/pdf/tablainvestigacion$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes/views/html/pdf/tablainvestigacion$$anonfun$apply$1.class
	target/scala-2.10/classes/views/html/pdf/tablainvestigacion$.class
	target/scala-2.10/classes/views/html/pdf/tablainvestigacion.class
	target/scala-2.10/classes/views/html/sidebar$.class
	target/scala-2.10/classes/views/html/sidebar.class
	target/scala-2.10/classes_managed/Routes$$anonfun$documentation$1.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$1.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$10.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$11.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$12.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$13.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$14.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$15.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$16.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$17.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$18.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$19.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$2.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$20.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$21.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$22.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$23.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$24$$anonfun$apply$24.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$24.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$3.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$4.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$5.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$6.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$7.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$8.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1$$anonfun$applyOrElse$9.class
	target/scala-2.10/classes_managed/Routes$$anonfun$routes$1.class
	target/scala-2.10/classes_managed/Routes$.class
	target/scala-2.10/classes_managed/Routes.class
	target/scala-2.10/classes_managed/controllers/ReverseApplication.class
	target/scala-2.10/classes_managed/controllers/ReverseAssets.class
	target/scala-2.10/classes_managed/controllers/ReverseInforme1.class
	target/scala-2.10/classes_managed/controllers/ReverseInforme2.class
	target/scala-2.10/classes_managed/controllers/ReverseInforme3.class
	target/scala-2.10/classes_managed/controllers/ReverseInforme4.class
	target/scala-2.10/classes_managed/controllers/ReverseInforme5.class
	target/scala-2.10/classes_managed/controllers/ReverseInforme6.class
	target/scala-2.10/classes_managed/controllers/javascript/ReverseApplication.class
	target/scala-2.10/classes_managed/controllers/javascript/ReverseAssets.class
	target/scala-2.10/classes_managed/controllers/javascript/ReverseInforme1.class
	target/scala-2.10/classes_managed/controllers/javascript/ReverseInforme2.class
	target/scala-2.10/classes_managed/controllers/javascript/ReverseInforme3.class
	target/scala-2.10/classes_managed/controllers/javascript/ReverseInforme4.class
	target/scala-2.10/classes_managed/controllers/javascript/ReverseInforme5.class
	target/scala-2.10/classes_managed/controllers/javascript/ReverseInforme6.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseApplication$$anonfun$cambioSemestre$1.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseApplication$$anonfun$index$1.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseApplication$$anonfun$prueba$1.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseApplication.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseAssets$$anonfun$at$1.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseAssets.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme1$$anonfun$excel$2.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme1$$anonfun$informeProfesor$1.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme1$$anonfun$pdf$2.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme1.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme2$$anonfun$excel$6.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme2$$anonfun$informeProfesor$3.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme2$$anonfun$pdf$6.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme2.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme3$$anonfun$excel$5.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme3$$anonfun$informeProfesor$2.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme3$$anonfun$pdf$5.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme3.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme4$$anonfun$excel$3.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme4$$anonfun$informeFacultad$1.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme4$$anonfun$pdf$3.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme4.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme5$$anonfun$excel$1.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme5$$anonfun$informePrograma$1.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme5$$anonfun$pdf$1.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme5.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme6$$anonfun$excel$4.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme6$$anonfun$informeParticipantes$1.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme6$$anonfun$pdf$4.class
	target/scala-2.10/classes_managed/controllers/ref/ReverseInforme6.class
	target/scala-2.10/classes_managed/views/html/index$.class
	target/scala-2.10/classes_managed/views/html/index.class
	target/scala-2.10/classes_managed/views/html/informes/informedocencia$.class
	target/scala-2.10/classes_managed/views/html/informes/informedocencia.class
	target/scala-2.10/classes_managed/views/html/informes/informefacultad$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/informes/informefacultad$.class
	target/scala-2.10/classes_managed/views/html/informes/informefacultad.class
	target/scala-2.10/classes_managed/views/html/informes/informefinal$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/informes/informefinal$.class
	target/scala-2.10/classes_managed/views/html/informes/informefinal.class
	target/scala-2.10/classes_managed/views/html/informes/informeheteroevaluacion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3.class
	target/scala-2.10/classes_managed/views/html/informes/informeheteroevaluacion$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes_managed/views/html/informes/informeheteroevaluacion$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/informes/informeheteroevaluacion$$anonfun$apply$10$$anonfun$apply$11.class
	target/scala-2.10/classes_managed/views/html/informes/informeheteroevaluacion$$anonfun$apply$10.class
	target/scala-2.10/classes_managed/views/html/informes/informeheteroevaluacion$$anonfun$apply$12$$anonfun$apply$13.class
	target/scala-2.10/classes_managed/views/html/informes/informeheteroevaluacion$$anonfun$apply$12.class
	target/scala-2.10/classes_managed/views/html/informes/informeheteroevaluacion$$anonfun$apply$4$$anonfun$apply$5$$anonfun$apply$6.class
	target/scala-2.10/classes_managed/views/html/informes/informeheteroevaluacion$$anonfun$apply$4$$anonfun$apply$5.class
	target/scala-2.10/classes_managed/views/html/informes/informeheteroevaluacion$$anonfun$apply$4.class
	target/scala-2.10/classes_managed/views/html/informes/informeheteroevaluacion$$anonfun$apply$7$$anonfun$apply$8$$anonfun$apply$9.class
	target/scala-2.10/classes_managed/views/html/informes/informeheteroevaluacion$$anonfun$apply$7$$anonfun$apply$8.class
	target/scala-2.10/classes_managed/views/html/informes/informeheteroevaluacion$$anonfun$apply$7.class
	target/scala-2.10/classes_managed/views/html/informes/informeheteroevaluacion$.class
	target/scala-2.10/classes_managed/views/html/informes/informeheteroevaluacion.class
	target/scala-2.10/classes_managed/views/html/informes/informeparticipantes$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes_managed/views/html/informes/informeparticipantes$$anonfun$apply$1$$anonfun$apply$3.class
	target/scala-2.10/classes_managed/views/html/informes/informeparticipantes$$anonfun$apply$1$$anonfun$apply$4.class
	target/scala-2.10/classes_managed/views/html/informes/informeparticipantes$$anonfun$apply$1$$anonfun$apply$5.class
	target/scala-2.10/classes_managed/views/html/informes/informeparticipantes$$anonfun$apply$1$$anonfun$apply$6.class
	target/scala-2.10/classes_managed/views/html/informes/informeparticipantes$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/informes/informeparticipantes$.class
	target/scala-2.10/classes_managed/views/html/informes/informeparticipantes.class
	target/scala-2.10/classes_managed/views/html/informes/informeprofesor$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes_managed/views/html/informes/informeprofesor$$anonfun$apply$1$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.10/classes_managed/views/html/informes/informeprofesor$$anonfun$apply$1$$anonfun$apply$3.class
	target/scala-2.10/classes_managed/views/html/informes/informeprofesor$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/informes/informeprofesor$.class
	target/scala-2.10/classes_managed/views/html/informes/informeprofesor.class
	target/scala-2.10/classes_managed/views/html/informes/informeprograma$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/informes/informeprograma$.class
	target/scala-2.10/classes_managed/views/html/informes/informeprograma.class
	target/scala-2.10/classes_managed/views/html/informes/tabladocencia$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3$$anonfun$apply$4$$anonfun$apply$5.class
	target/scala-2.10/classes_managed/views/html/informes/tabladocencia$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.10/classes_managed/views/html/informes/tabladocencia$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3.class
	target/scala-2.10/classes_managed/views/html/informes/tabladocencia$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes_managed/views/html/informes/tabladocencia$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/informes/tabladocencia$.class
	target/scala-2.10/classes_managed/views/html/informes/tabladocencia.class
	target/scala-2.10/classes_managed/views/html/informes/tablagestion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.10/classes_managed/views/html/informes/tablagestion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3.class
	target/scala-2.10/classes_managed/views/html/informes/tablagestion$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes_managed/views/html/informes/tablagestion$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/informes/tablagestion$.class
	target/scala-2.10/classes_managed/views/html/informes/tablagestion.class
	target/scala-2.10/classes_managed/views/html/informes/tablainvestigacion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.10/classes_managed/views/html/informes/tablainvestigacion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3.class
	target/scala-2.10/classes_managed/views/html/informes/tablainvestigacion$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes_managed/views/html/informes/tablainvestigacion$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/informes/tablainvestigacion$.class
	target/scala-2.10/classes_managed/views/html/informes/tablainvestigacion.class
	target/scala-2.10/classes_managed/views/html/lista$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/lista$.class
	target/scala-2.10/classes_managed/views/html/lista.class
	target/scala-2.10/classes_managed/views/html/listafacultades$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/listafacultades$.class
	target/scala-2.10/classes_managed/views/html/listafacultades.class
	target/scala-2.10/classes_managed/views/html/listainformes$.class
	target/scala-2.10/classes_managed/views/html/listainformes.class
	target/scala-2.10/classes_managed/views/html/listaprogramas$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/listaprogramas$.class
	target/scala-2.10/classes_managed/views/html/listaprogramas.class
	target/scala-2.10/classes_managed/views/html/listasemestres$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/listasemestres$.class
	target/scala-2.10/classes_managed/views/html/listasemestres.class
	target/scala-2.10/classes_managed/views/html/main$.class
	target/scala-2.10/classes_managed/views/html/main.class
	target/scala-2.10/classes_managed/views/html/mainmenu$.class
	target/scala-2.10/classes_managed/views/html/mainmenu.class
	target/scala-2.10/classes_managed/views/html/pdf/informedocencia$.class
	target/scala-2.10/classes_managed/views/html/pdf/informedocencia.class
	target/scala-2.10/classes_managed/views/html/pdf/informefacultad$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/pdf/informefacultad$.class
	target/scala-2.10/classes_managed/views/html/pdf/informefacultad.class
	target/scala-2.10/classes_managed/views/html/pdf/informefinal$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/pdf/informefinal$.class
	target/scala-2.10/classes_managed/views/html/pdf/informefinal.class
	target/scala-2.10/classes_managed/views/html/pdf/informeheteroevaluacion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3.class
	target/scala-2.10/classes_managed/views/html/pdf/informeheteroevaluacion$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes_managed/views/html/pdf/informeheteroevaluacion$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/pdf/informeheteroevaluacion$$anonfun$apply$10$$anonfun$apply$11.class
	target/scala-2.10/classes_managed/views/html/pdf/informeheteroevaluacion$$anonfun$apply$10.class
	target/scala-2.10/classes_managed/views/html/pdf/informeheteroevaluacion$$anonfun$apply$12$$anonfun$apply$13.class
	target/scala-2.10/classes_managed/views/html/pdf/informeheteroevaluacion$$anonfun$apply$12.class
	target/scala-2.10/classes_managed/views/html/pdf/informeheteroevaluacion$$anonfun$apply$4$$anonfun$apply$5$$anonfun$apply$6.class
	target/scala-2.10/classes_managed/views/html/pdf/informeheteroevaluacion$$anonfun$apply$4$$anonfun$apply$5.class
	target/scala-2.10/classes_managed/views/html/pdf/informeheteroevaluacion$$anonfun$apply$4.class
	target/scala-2.10/classes_managed/views/html/pdf/informeheteroevaluacion$$anonfun$apply$7$$anonfun$apply$8$$anonfun$apply$9.class
	target/scala-2.10/classes_managed/views/html/pdf/informeheteroevaluacion$$anonfun$apply$7$$anonfun$apply$8.class
	target/scala-2.10/classes_managed/views/html/pdf/informeheteroevaluacion$$anonfun$apply$7.class
	target/scala-2.10/classes_managed/views/html/pdf/informeheteroevaluacion$.class
	target/scala-2.10/classes_managed/views/html/pdf/informeheteroevaluacion.class
	target/scala-2.10/classes_managed/views/html/pdf/informeparticipantes$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes_managed/views/html/pdf/informeparticipantes$$anonfun$apply$1$$anonfun$apply$3.class
	target/scala-2.10/classes_managed/views/html/pdf/informeparticipantes$$anonfun$apply$1$$anonfun$apply$4.class
	target/scala-2.10/classes_managed/views/html/pdf/informeparticipantes$$anonfun$apply$1$$anonfun$apply$5.class
	target/scala-2.10/classes_managed/views/html/pdf/informeparticipantes$$anonfun$apply$1$$anonfun$apply$6.class
	target/scala-2.10/classes_managed/views/html/pdf/informeparticipantes$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/pdf/informeparticipantes$.class
	target/scala-2.10/classes_managed/views/html/pdf/informeparticipantes.class
	target/scala-2.10/classes_managed/views/html/pdf/informeprofesor$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes_managed/views/html/pdf/informeprofesor$$anonfun$apply$1$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.10/classes_managed/views/html/pdf/informeprofesor$$anonfun$apply$1$$anonfun$apply$3.class
	target/scala-2.10/classes_managed/views/html/pdf/informeprofesor$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/pdf/informeprofesor$.class
	target/scala-2.10/classes_managed/views/html/pdf/informeprofesor.class
	target/scala-2.10/classes_managed/views/html/pdf/informeprograma$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/pdf/informeprograma$.class
	target/scala-2.10/classes_managed/views/html/pdf/informeprograma.class
	target/scala-2.10/classes_managed/views/html/pdf/tabladocencia$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3$$anonfun$apply$4$$anonfun$apply$5.class
	target/scala-2.10/classes_managed/views/html/pdf/tabladocencia$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.10/classes_managed/views/html/pdf/tabladocencia$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3.class
	target/scala-2.10/classes_managed/views/html/pdf/tabladocencia$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes_managed/views/html/pdf/tabladocencia$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/pdf/tabladocencia$.class
	target/scala-2.10/classes_managed/views/html/pdf/tabladocencia.class
	target/scala-2.10/classes_managed/views/html/pdf/tablagestion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.10/classes_managed/views/html/pdf/tablagestion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3.class
	target/scala-2.10/classes_managed/views/html/pdf/tablagestion$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes_managed/views/html/pdf/tablagestion$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/pdf/tablagestion$.class
	target/scala-2.10/classes_managed/views/html/pdf/tablagestion.class
	target/scala-2.10/classes_managed/views/html/pdf/tablainvestigacion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3$$anonfun$apply$4.class
	target/scala-2.10/classes_managed/views/html/pdf/tablainvestigacion$$anonfun$apply$1$$anonfun$apply$2$$anonfun$apply$3.class
	target/scala-2.10/classes_managed/views/html/pdf/tablainvestigacion$$anonfun$apply$1$$anonfun$apply$2.class
	target/scala-2.10/classes_managed/views/html/pdf/tablainvestigacion$$anonfun$apply$1.class
	target/scala-2.10/classes_managed/views/html/pdf/tablainvestigacion$.class
	target/scala-2.10/classes_managed/views/html/pdf/tablainvestigacion.class
	target/scala-2.10/classes_managed/views/html/sidebar$.class
	target/scala-2.10/classes_managed/views/html/sidebar.class
Merge branch 'master' of https://github.com/camilo255423/ModuloInformes
xxx
Merge branch 'master' of https://github.com/camilo255423/ModuloInformes
cambios
Merge branch 'master' of https://github.com/camilo255423/ModuloInformes

Conflicts:
	target/resolution-cache/moduloinformes/moduloinformes_2.10/1.0-SNAPSHOT/resolved.xml.properties
	target/resolution-cache/moduloinformes/moduloinformes_2.10/1.0-SNAPSHOT/resolved.xml.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-compile-internal.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-compile.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-docs.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-optional.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-plugin.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-pom.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-provided.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-runtime-internal.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-runtime.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-scala-tool.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-sources.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-test-internal.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-test.xml
	target/scala-2.10/api/controllers/Admin.html
	target/scala-2.10/api/controllers/ReverseAdmin.html
	target/scala-2.10/api/controllers/Secured.html
	target/scala-2.10/api/controllers/javascript/ReverseAdmin.html
	target/scala-2.10/api/controllers/javascript/package.html
	target/scala-2.10/api/controllers/package.html
	target/scala-2.10/api/controllers/ref/ReverseAdmin.html
	target/scala-2.10/api/controllers/ref/package.html
	target/scala-2.10/api/index/index-a.html
	target/scala-2.10/api/index/index-e.html
	target/scala-2.10/api/index/index-f.html
	target/scala-2.10/api/index/index-i.html
	target/scala-2.10/api/index/index-l.html
	target/scala-2.10/api/index/index-p.html
	target/scala-2.10/api/index/index-r.html
	target/scala-2.10/api/models/Rol.html
	target/scala-2.10/api/models/Usuario.html
	target/scala-2.10/api/views/html/admin$.html
	target/scala-2.10/api/views/html/encabezado$.html
	target/scala-2.10/api/views/html/login$.html
	target/scala-2.10/api/views/html/package.html
	target/scala-2.10/src_managed/main/controllers/routes.java
	target/scala-2.10/src_managed/main/routes_reverseRouting.scala
	target/scala-2.10/src_managed/main/routes_routing.scala
	target/scala-2.10/src_managed/main/views/html/admin.template.scala
	target/scala-2.10/src_managed/main/views/html/encabezado.template.scala
	target/scala-2.10/src_managed/main/views/html/index.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informedocencia.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informefacultad.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informefinal.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informeheteroevaluacion.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informeparticipantes.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informeprofesor.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informeprograma.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/tabladocencia.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/tablagestion.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/tablainvestigacion.template.scala
	target/scala-2.10/src_managed/main/views/html/lista.template.scala
	target/scala-2.10/src_managed/main/views/html/listafacultades.template.scala
	target/scala-2.10/src_managed/main/views/html/listainformes.template.scala
	target/scala-2.10/src_managed/main/views/html/listaprogramas.template.scala
	target/scala-2.10/src_managed/main/views/html/listasemestres.template.scala
	target/scala-2.10/src_managed/main/views/html/login.template.scala
	target/scala-2.10/src_managed/main/views/html/main.template.scala
	target/scala-2.10/src_managed/main/views/html/mainmenu.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informedocencia.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informefacultad.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informefinal.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informeheteroevaluacion.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informeparticipantes.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informeprofesor.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informeprograma.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/tabladocencia.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/tablagestion.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/tablainvestigacion.template.scala
	target/scala-2.10/src_managed/main/views/html/sidebar.template.scala
	target/streams/$global/update/$global/out
	target/streams/$global/update/$global/output
	target/streams/compile/doc/$global/out
war funcionando
Merge branch 'master' of https://github.com/camilo255423/ModuloInformes

Conflicts:
	app/controllers/Application.java
	target/scala-2.10/src_managed/main/views/html/mainmenu.template.scala
	target/streams/compile/compile/$global/export
	target/streams/compile/incCompileSetup/$global/inc_compile
p
Merge branch 'master' of https://github.com/camilo255423/ModuloInformes

Conflicts:
	app/controllers/Application.java
	app/views/mainmenu.scala.html
	target/scala-2.10/src_managed/main/views/html/admin.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informeparticipantes.template.scala
	target/scala-2.10/src_managed/main/views/html/main.template.scala
	target/scala-2.10/src_managed/main/views/html/mainmenu.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informefacultad.template.scala
	target/streams/compile/compile/$global/export
	target/streams/compile/copyResources/$global/copy-resources
	target/streams/compile/incCompileSetup/$global/inc_compile
xxx
-1
Merge branch 'master' of https://github.com/camilo255423/ModuloInformes

Conflicts:
	target/scala-2.10/src_managed/main/controllers/routes.java
	target/scala-2.10/src_managed/main/routes_reverseRouting.scala
	target/scala-2.10/src_managed/main/routes_routing.scala
	target/scala-2.10/src_managed/main/views/html/informes/informefacultad.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informefinal.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informeprograma.template.scala
	target/scala-2.10/src_managed/main/views/html/lista.template.scala
	target/scala-2.10/src_managed/main/views/html/listainformes.template.scala
	target/scala-2.10/src_managed/main/views/html/listasemestres.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informefacultad.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informefinal.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informeprofesor.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informeprograma.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/tablagestion.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/tablainvestigacion.template.scala
	target/scala-2.10/src_managed/main/views/html/sidebar.template.scala
	target/streams/$global/playCopyAssets/$global/out
	target/streams/compile/compile/$global/export
	target/streams/compile/copyResources/$global/copy-resources
	target/streams/compile/incCompileSetup/$global/inc_compile
-2
Merge branch 'master' of https://github.com/camilo255423/ModuloInformes

Conflicts:
	logs/application.log
	target/resolution-cache/evadoc/evadoc_2.10/1/resolved.xml.properties
	target/resolution-cache/evadoc/evadoc_2.10/1/resolved.xml.xml
	target/resolution-cache/reports/evadoc-evadoc_2.10-compile-internal.xml
	target/resolution-cache/reports/evadoc-evadoc_2.10-compile.xml
	target/resolution-cache/reports/evadoc-evadoc_2.10-docs.xml
	target/resolution-cache/reports/evadoc-evadoc_2.10-runtime-internal.xml
	target/resolution-cache/reports/evadoc-evadoc_2.10-runtime.xml
	target/resolution-cache/reports/evadoc-evadoc_2.10-scala-tool.xml
	target/resolution-cache/reports/evadoc-evadoc_2.10-test-internal.xml
	target/resolution-cache/reports/evadoc-evadoc_2.10-test.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-optional.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-plugin.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-pom.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-provided.xml
	target/resolution-cache/reports/moduloinformes-moduloinformes_2.10-sources.xml
	target/scala-2.10/src_managed/main/controllers/routes.java
	target/scala-2.10/src_managed/main/routes_reverseRouting.scala
	target/scala-2.10/src_managed/main/routes_routing.scala
	target/scala-2.10/src_managed/main/views/html/admin.template.scala
	target/scala-2.10/src_managed/main/views/html/encabezado.template.scala
	target/scala-2.10/src_managed/main/views/html/index.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informedocencia.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informefacultad.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informefinal.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informeheteroevaluacion.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informeparticipantes.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informeprofesor.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informeprograma.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/tabladocencia.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/tablagestion.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/tablainvestigacion.template.scala
	target/scala-2.10/src_managed/main/views/html/lista.template.scala
	target/scala-2.10/src_managed/main/views/html/listafacultades.template.scala
	target/scala-2.10/src_managed/main/views/html/listainformes.template.scala
	target/scala-2.10/src_managed/main/views/html/listaprogramas.template.scala
	target/scala-2.10/src_managed/main/views/html/listasemestres.template.scala
	target/scala-2.10/src_managed/main/views/html/login.template.scala
	target/scala-2.10/src_managed/main/views/html/main.template.scala
	target/scala-2.10/src_managed/main/views/html/mainmenu.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informedocencia.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informefacultad.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informefinal.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informeheteroevaluacion.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informeparticipantes.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informeprofesor.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informeprograma.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/tabladocencia.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/tablagestion.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/tablainvestigacion.template.scala
	target/scala-2.10/src_managed/main/views/html/sidebar.template.scala
	target/streams/$global/update/$global/out
	target/streams/$global/update/$global/output
	target/streams/compile/compile/$global/export
	target/streams/compile/incCompileSetup/$global/inc_compile
xxx
Merge branch 'modulo20141' of https://github.com/camilo255423/InpahuSIETE

Conflicts:
	app/controllers/Application.java
	logs/application.log
	target/scala-2.10/src_managed/main/views/html/admin.template.scala
	target/scala-2.10/src_managed/main/views/html/informes/informedocencia.template.scala
	target/scala-2.10/src_managed/main/views/html/lista.template.scala
	target/scala-2.10/src_managed/main/views/html/listaprogramas.template.scala
	target/scala-2.10/src_managed/main/views/html/listasemestres.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informefacultad.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informeheteroevaluacion.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informeparticipantes.template.scala
	target/scala-2.10/src_managed/main/views/html/pdf/informeprograma.template.scala
	target/scala-2.10/src_managed/main/views/html/sidebar.template.scala
	target/streams/compile/compile/$global/export
	target/streams/compile/incCompileSetup/$global/inc_compile
	target/streams/compile/managedSources/$global/out