Merge pull request #1 from centwave/master

整合 html css js
for combine
Merge branch
json api
Merge pull request #1 from loveson821/master

20130427