my configure
add permisson
Merge branch 'master' into yp

Conflicts:
	src/main/AndroidManifest.xml
	src/main/java/com/hyrt/cnp/module/ServicesModule.java
Merge branch 'master' into yp

Conflicts:
	src/main/AndroidManifest.xml
no change
add main page
no change
add person cover
Merge branch 'master' of github.com:hyrtyp/app

Conflicts:
	src/main/java/com/hyrt/cnp/module/ActivityModule.java