Actualitzacions Manteniments.
Merge branch 'master' of https://github.com/oadan79/ebre-escool

Conflicts:
	application/modules/curriculum/language/catalan/curriculum_lang.php