Se sube nueva version para produccion con Flat UI Pro
merge con kike
merge con kike
merge con kike
se agrego eventbrite y comentarios
se agrego fontello
se agrego el brand css
Se sube funcionalidad para pestañas de los cursos.
se alineo el texto del curso
Merge remote-tracking branch 'production/production'

Conflicts:
	client/views/top_bar.html
Merge remote-tracking branch 'production/production'
Merge remote-tracking branch 'production/production'

Conflicts:
	client/views/top_bar.html
se cambio el nombre de capacitador a course trainer
Merge remote-tracking branch 'production/production'
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