Merge branch 'master' into qco_new_structure
Qco with new hour schedule.
Comments on QCO model.
Merge branch 'master' into qco_new_structure
New QH.
Merge branch 'master' into qco_new_structure

Conflicts:
	.zfproject.xml
Bug fixed in schedule inactive vehicle.
cancel scheduling
Merge branch 'master' into qco_new_structure
Finished upload QH file.
Merge branch 'qco_new_structure'
QCO without shape file.
Merge branch 'qco_new_structure'
Merge remote-tracking branch 'origin/Nachesi'
Merge branch 'master' of https://github.com/tecbus/onibus
bug vehicle new and edited