Home Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	UFriend/gen/com/mobile/UFriend/R.java
Home Update