o no 不能不提吗...
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/rejuvenation/MainActivity.java