Linking and pretty url of the pages
merging issue-70 into develop and resolved conflicts