Update to tree & api controllers
Merge branch 'master' of https://github.com/warrenbuckley/Analytics