Merge remote-tracking branch 'origin/master' into chenyan

Conflicts:
	src/com/chainton/pdmclient/MyHomeActivity.java
Merge branch 'chenyan'
Merge branch 'chenyan'
Merge branch 'chenyan'