model refatoring to paths; update affected controllers and renderers
Merge branch 'master' into grunt