spacing done
routing, pretty urls, minor changes
Merge branch 'issue-81' into develop
resolved conflicts and merging issue-82 into develop
resolved active class issues
Merge branch 'issue-84' into develop
Minor changes
Merge branch 'develop'