...
Merge branch 'master' of https://github.com/exprezzo/fastt

Conflicts:
	apps/fastorder/vistas/general/historias.php