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

Conflicts:
	app/src/main/java/com/cyberagent/ameba/heytaxi/SampleView.java
tes
repair button