routing, pretty urls, minor changes
resolved conflicts and merging issue-82 into develop