putin
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/ch/crut/taxi/ActivityMain.java
	app/src/main/java/ch/crut/taxi/TaxiApplication.java
	app/src/main/res/values/strings.xml
Merge remote-tracking branch 'origin/master'