routing and pretty urls
Merging issue-103 into develop and resolved conflicts