Se corrigen textos
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/Routes.js
	client/controllers/courses/courses.js
	client/views/top_bar.html