Added Edit this page link
Added Edit this page link
Merged the master branch