Merge branch 'chende'

Conflicts:
	src/com/chainton/pdmclient/view/custom/FragmentTitleView.java
。
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmclient/view/custom/FragmentTitleView.java