track new files
Merge branch 'controller' into view_v2