update template.php
Merge branch 'beta' into beta-scribdjs