0912
Merge branch 'master' of https://github.com/tmyoas/HeyTaxi

Conflicts:
	app/src/main/java/com/cyberagent/ameba/heytaxi/Taxi.java
0914
Merge branch 'master' of https://github.com/tmyoas/HeyTaxi

Conflicts:
	app/src/main/java/com/cyberagent/ameba/heytaxi/SampleView.java
	app/src/main/java/com/cyberagent/ameba/heytaxi/Taxi.java
0915
0916