add elearning + resources
Merge branch 'develop' of https://github.com/42Zavattas/intra into develop

Conflicts:
	app/translations/en.json