No se que pasa
Merge branch 'master' of https://github.com/Victor-arias/tm

Conflicts:
	js/file.app.min.js
	protected/views/layouts/telemedellin.php
Más ajustes