Refactor of goss-demo
Working on goss-demo refactor
Merge branch 'master' of https://github.com/GridOPTICS/GOSS

Conflicts:
	goss-demo-feature/pom.xml
	goss-karaf-assembly/pom.xml
	goss-server/pom.xml
	goss-server/src/main/java/pnnl/goss/server/ServerMain.java
	pom.xml
Updated to most recent version
Merge
Merge branch 'master' of https://github.com/GridOPTICS/GOSS

Conflicts:
	goss-karaf-assembly/pom.xml
Added goss-vaadin project
Fix to make kairosdb activator an ipojo component and include the kairosdb properties in the core config and use the correct client type in gossserviceimple
Fixed how the kairosdb activator gets its properties
Vaadin sample ui updates
Added test login page
vaadin sample updates, latest status working on integrating a chart plugin
added synthetic data feature
Merge branch 'vaadin-testing'

Conflicts:
	pom.xml