Added index to application controller
Merge branch 'controller' into development