taxiflow completo
Merge branch 'taxi-flow' of https://github.com/jmtast/computacion-movil into taxi-flow

Conflicts:
	app/workspace/example/Example/src/dc/uba/taxinow/utils/JsonHelper.java
hryjty
Merge branch 'taxi-flow' of https://github.com/jmtast/computacion-movil into taxi-flow