changes in template files
Merge pull request #3 from etisbew/joinpagebranch

changes in template files