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

Conflicts:
	makefile
update docs.html
Merge pull request #24 from BluntBlade/master

添加pm3u8接口与avinfo接口的API文档。
add demos based on jsfiddle
Merge pull request #25 from icattlecoder/feature/demos

add demos based on jsfiddle
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页面侧边栏闪烁问题
Merge pull request #26 from BluntBlade/master

异步处理 => 持久化处理。
del upcase
Merge pull request #28 from icattlecoder/feature/delupcase

del upcase