정선진 커밋테스트2
Merge remote-tracking branch 'origin/master'

Conflicts:
	taxi/src/main/webapp/auth/auth.js