Merge pull request #85 from HollyDAI/master

Merge pull request #84 from HollyDAI/xr
Merge pull request #89 from HollyDAI/master

5.19
Merge pull request #90 from HollyDAI/holly

20140521 17：12 资源的分页显示实现
Merge pull request #91 from HollyDAI/master

5.22
完成tag的添加，note的更新（tag不能改变）
Merge pull request #92 from HollyDAI/xr

Xr
Merge pull request #94 from HollyDAI/master

holly