merge makefile
Merge remote-tracking branch 'qiniu/master' into api_nav_flash

Conflicts:
	makefile
update docs.html
update resource.json / docs.html /download.html
footer
span
update json/html
Merge remote-tracking branch 'qiniu/master' into api_nav_flash
fix the border-right bug
Merge pull request #23 from SunLn/api_nav_flash

api页面侧边栏闪烁问题