Merge remote-tracking branch 'origin/master'

Conflicts:
	LateLiao/src/com/example/nav2/UserActivity.java