unit tests for router to confirm working
Merge branch 'ash/admin-router'
merging with master
Merge branch 'master' of github.com:StormCreative/admin into dave/uploader