span/Team05 — pull request #52 by demonicblue (2012-10-05 12:58:34+00:00)
Title: 18 use existing route

Merging renames and refactoring.