create comany relation with courses and trivium  CR:AM
Merge branch 'template' of github.com:vairix-gfagalde/aprende into template

Conflicts:
	app/controllers/trivium_controller.rb
add sistem_teacher and fix some style CR:AM