Today bar line fixed to mark beginning of future data.
Added Lynn's changes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	AppliedAnalytics/src/main/java/io/analytics/site/controllers/WidgetController.java
	AppliedAnalytics/src/main/webapp/WEB-INF/views/pages/Master.jsp
	AppliedAnalytics/src/main/webapp/resources/cache/javascript/hypothetical-future.js
Merge branch 'master' into revert5
Merge with Gwen's changes and fixed branch

Conflicts:
	AppliedAnalytics/src/main/java/io/analytics/repository/ICoreReportingRepository.java
	AppliedAnalytics/src/main/java/io/analytics/service/CoreReportingService.java
	AppliedAnalytics/src/main/java/io/analytics/service/ICoreReportingService.java
	AppliedAnalytics/src/main/java/io/analytics/site/controllers/ApplicationController.java