Updates to dashboard view
Merge branch 'development' of https://github.com/TeamFit/web-app into development
Index fixes for angular