MP-527 Drawing urls
Merge branch 'master' of github.com:point97/marco-portal2
Namespacing existing stuff may cause things to break, reverting for now.