Merge pull request #922 from linzongshu/develop

Adjusted block template of article
Angularjs pi.js update for #886 issue
Merge pull request #925 from sexnothing/develop

Angularjs pi.js update for #886 issue