瀑布流初步
瀑布流初步
todo
Merge remote-tracking branch 'origin/master' into jzp
修改AndroidManifest   Hairdo初步

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

Conflicts:
	AndroidManifest.xml