added toggle between views
Merge branch 'master' into toggle
added dashboard and timeline toggle buttons
Renames timeline icon