se agrego plantilla de teacher
Merge branch 'master' of github.com:manduks/cursos
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/views/course/teacher_tpl.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/views/course/teacher_tpl.html
Se corrigen textos
Merge remote-tracking branch 'origin/master'

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