merge
Merge
Merge branch 'master' of https://github.com/stuartshay/NavigatorGlass

Conflicts:
	NavigatorGlass.WebApi/Content/css/Site.css
	NavigatorGlass.WebApi/app/Controllers/TimelineController.js
	NavigatorGlass.WebApi/app/Views/TimelineDashboard.html