Commit
Merge branch 'master' of https://github.com/churde/educappBackbone

Conflicts:
	templates-gestor/about.html
	templates-gestor/correccion.html
	templates-gestor/correccion_indiv.html
	templates-gestor/edit.css
	templates-gestor/edit.html
	templates-gestor/edit_tasks.html
	templates-gestor/ficha.css
	templates-gestor/ficha.html
	templates-gestor/help.html
	templates-gestor/inicio.html
	templates-gestor/lib/js/bootstrap-datepicker.js
	templates-gestor/lib/js/main.js
	templates-gestor/panel.html
	templates-gestor/tasks.html