taxi config, text fileds being saved. img failing
otra magia loca q aparecio por ahi
algo para postear la data al servidor, por ahora comentado
Merge branch 'master' into taxi-preferences

Conflicts:
	app/workspace/example/Example/res/values/strings.xml
no anda y no se xq :(
rkhgbbnjkd
fix de wifuiehgorjhb
Merge branch 'taxi-flow' into merge-branches

Conflicts:
	app/workspace/example/Example/AndroidManifest.xml
	app/workspace/example/Example/res/layout/fragment_taxi_config.xml
	app/workspace/example/Example/res/values/strings.xml
	app/workspace/example/Example/src/com/hw/example/PassengerConfigActivity.java
	app/workspace/example/Example/src/com/hw/example/TaxiConfigActivity.java