oh
修改AndroidManifest   Hairdo初步

等待陈松松解决百度位置的问题，App无法正常启动
delete lib
Merge remote-tracking branch 'origin/JZ' into CSSPeter

Conflicts:
	AndroidManifest.xml
Merge remote-tracking branch 'origin/CSSPeter'