Merge pull request #19 from Goldfish9593/develop

合并到 javadoc 分支，准备文档生成
补全缺少的javadoc标记 @20141230
Merge pull request #20 from Goldfish9593/javadoc

javadoc 标记补全以后合并回开发分支