Merge remote-tracking branch 'origin/master' into timeline
Merge remote-tracking branch 'origin/master' into timeline
Merge remote-tracking branch 'origin/master' into timeline
Merge remote-tracking branch 'origin/master' into timeline
settings view added.
Merge remote-tracking branch 'origin/timeline'

Conflicts:
	Web/Controllers/DashboardController.cs
Dashboard renamed as Home