Merge remote-tracking branch 'origin/master'

Conflicts:
	Code/Car/gen/com/car/R.java
	Code/Car/res/layout/activity_login.xml