Website Generator: Set page_name
Minor: Data Import test case
Merge pull request #679 from anandpdoshi/anand-july-7

Fixes in Website Generator and Data Import test case