Renderer namespace to Model, to not conflict with class of the same name
Merge branch '1.x'
Merge branch 'master' of https://github.com/robertleeplummerjr/wikiLingo