Update
update
add ppt
Update
Update
Update
Update
Update
2
Merge branch 'jiangzhonghui' into Vinson

Conflicts:
	wkb-app/src/main/java/com/apj/wkb/fragment/HomeFragment.java
	wkb-app/src/main/res/layout/fragment_category.xml
	wkb-app/src/main/res/values/styles.xml
del