修改头像位置
修改头像
Merge branch 'master' into chende

Conflicts:
	res/values/strings.xml
	src/com/chainton/pdmclient/SetRouterActivity.java
	src/com/chainton/pdmclient/contstant/BroadcastActions.java
	src/com/chainton/pdmclient/sharecircle/PdmClientMessageHandler.java
Merge branch 'chende'

Conflicts:
	src/com/chainton/pdmclient/SetRouterActivity.java
Merge remote-tracking branch 'origin/master' into chenyan
。
。
Merge branch 'chenyan'
Merge branch 'master' into chende