test commit from lynn
test 2 lynn
test 3 lynn
test 4
test 5
Merge branch 'master' of github.com:inverts/Data-Tamers

Conflicts:
	AppliedAnalytics/.metadata/.log
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.atlassian.connector.eclipse.jira.ui.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ajdt.ui.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.ui.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.server.core.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.springsource.ide.eclipse.commons.configurator.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.springsource.ide.eclipse.commons.core.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.springsource.ide.eclipse.commons.frameworks.core.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.springsource.ide.eclipse.dashboard.ui.prefs
	AppliedAnalytics/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	AppliedAnalytics/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	AppliedAnalytics/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	AppliedAnalytics/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
	AppliedAnalytics/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	AppliedAnalytics/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	AppliedAnalytics/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	AppliedAnalytics/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.my-pc_19/FP.local.files_0/node.properties
	AppliedAnalytics/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.my-pc_19/H.local_16/node.properties
	AppliedAnalytics/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.my-pc_19/node.properties
	AppliedAnalytics/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	AppliedAnalytics/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	AppliedAnalytics/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	AppliedAnalytics/.metadata/.plugins/org.eclipse.ui/dialog_settings.xml
	AppliedAnalytics/.metadata/.plugins/org.eclipse.wst.jsdt.core/libraries/dom5.js
	AppliedAnalytics/.metadata/.plugins/org.eclipse.wst.server.core/servers.xml
	AppliedAnalytics/.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
	AppliedAnalytics/.metadata/.plugins/org.springframework.ide.eclipse.aop.core/.state
	AppliedAnalytics/.metadata/.plugins/org.springframework.ide.eclipse.roo.core/roo.installs
	AppliedAnalytics/.metadata/.plugins/org.springsource.ide.eclipse.commons.content.core/content.xml
	AppliedAnalytics/RemoteSystemsTempFiles/.project
	AppliedAnalytics/Servers/.project
	AppliedAnalytics/Servers/.settings/org.eclipse.wst.server.core.prefs
	AppliedAnalytics/Servers/VMware vFabric tc Server Developer Edition v2.9-config/context.xml
	AppliedAnalytics/Servers/VMware vFabric tc Server Developer Edition v2.9-config/server.xml
	AppliedAnalytics/Servers/VMware vFabric tc Server Developer Edition v2.9-config/tomcat-users.xml
	AppliedAnalytics/Servers/VMware vFabric tc Server Developer Edition v2.9-config/web.xml
	AppliedAnalytics/src/main/java/io/analytics/aspect/HeaderFooter.java
	AppliedAnalytics/src/main/java/io/analytics/aspect/SiteAspect.java
	AppliedAnalytics/src/main/java/io/analytics/domain/Visitor.java
	AppliedAnalytics/src/main/java/io/analytics/repository/IVisitorRepository.java
	AppliedAnalytics/src/main/java/io/analytics/repository/VisitorRepository.java
	AppliedAnalytics/src/main/java/io/analytics/service/IVisitorService.java
	AppliedAnalytics/src/main/java/io/analytics/service/VisitorService.java
	AppliedAnalytics/src/main/java/io/analytics/site/PageRenderer.java
	AppliedAnalytics/src/main/java/io/analytics/site/models/ForecastWidgetModel.java
	AppliedAnalytics/src/main/webapp/WEB-INF/views/includes/header.jsp
	AppliedAnalytics/src/main/webapp/WEB-INF/views/pages/page-template.jsp
	AppliedAnalytics/src/main/webapp/WEB-INF/views/widgets/hypothetical-future.jsp
	AppliedAnalytics/src/main/webapp/WEB-INF/views/widgets/widgets.xml
	AppliedAnalytics/src/main/webapp/resources/cache/css/hypothetical-future.css
	AppliedAnalytics/src/main/webapp/resources/cache/css/widget.css
	AppliedAnalytics/src/main/webapp/resources/cache/javascript/hypothetical-future.js
	AppliedAnalytics/src/test/java/io/analytics/domain/TestOf_Visitor.java
	AppliedAnalytics/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	AppliedAnalytics/target/m2e-wtp/web-resources/META-INF/maven/io.analytics/site/pom.properties