Merge branch 'master' of https://github.com/ZeMoSoLabs/zinteract-onpremise

Conflicts:
	OnPremiseInstall/.idea/.name
	OnPremiseInstall/.idea/misc.xml
	OnPremiseInstall/.idea/workspace.xml
	OnPremiseInstall/OnPremiseInstall.iml
	OnPremiseInstall/pom.xml
	OnPremiseInstall/src/main/java/com/zinteract/agent/Application.java
	OnPremiseInstall/src/main/java/com/zinteract/agent/repos/PatternMatchRepository.java
	OnPremiseInstall/src/main/java/com/zinteract/agent/repos/QueryPropsRepository.java
	OnPremiseInstall/src/main/java/com/zinteract/agent/repos/QueryRepository.java
	OnPremiseInstall/src/main/java/com/zinteract/agent/repos/QueryScheduleRepository.java
	OnPremiseInstall/src/main/java/com/zinteract/agent/repos/ZDataSourceRepository.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/ElasticsearchResult.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/QueryProps.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/QueryResult.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/QueryRun.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/Source.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/ZDataSource.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	.idea/vcs.xml
	app/controllers/UserController.java
	logs/application.log
	target/.history
	target/resolution-cache/default/play-cassandra_2.10/1.0-SNAPSHOT/resolved.xml.properties
	target/resolution-cache/default/play-cassandra_2.10/1.0-SNAPSHOT/resolved.xml.xml
	target/resolution-cache/reports/default-play-cassandra_2.10-compile-internal.xml
	target/resolution-cache/reports/default-play-cassandra_2.10-compile.xml
	target/resolution-cache/reports/default-play-cassandra_2.10-docs.xml
	target/resolution-cache/reports/default-play-cassandra_2.10-optional.xml
	target/resolution-cache/reports/default-play-cassandra_2.10-plugin.xml
	target/resolution-cache/reports/default-play-cassandra_2.10-pom.xml
	target/resolution-cache/reports/default-play-cassandra_2.10-provided.xml
	target/resolution-cache/reports/default-play-cassandra_2.10-runtime-internal.xml
	target/resolution-cache/reports/default-play-cassandra_2.10-runtime.xml
	target/resolution-cache/reports/default-play-cassandra_2.10-scala-tool.xml
	target/resolution-cache/reports/default-play-cassandra_2.10-sources.xml
	target/resolution-cache/reports/default-play-cassandra_2.10-test-internal.xml
	target/resolution-cache/reports/default-play-cassandra_2.10-test.xml
	target/scala-2.10/src_managed/main/controllers/routes.java
	target/scala-2.10/src_managed/main/routes_reverseRouting.scala
	target/scala-2.10/src_managed/main/routes_routing.scala
	target/scala-2.10/src_managed/main/views/html/index.template.scala
	target/scala-2.10/src_managed/main/views/html/main.template.scala
	target/streams/$global/playCopyAssets/$global/out
	target/streams/$global/update/$global/inputs
	target/streams/$global/update/$global/out
	target/streams/$global/update/$global/output
	target/streams/compile/compile/$global/export
	target/streams/compile/copyResources/$global/copy-resources
	target/streams/compile/copyResources/$global/out
	target/streams/compile/dependencyClasspath/$global/export
	target/streams/compile/exportedProducts/$global/export
	target/streams/compile/incCompileSetup/$global/inc_compile
	target/streams/runtime/dependencyClasspath/$global/export
	target/streams/runtime/exportedProducts/$global/export
	target/streams/runtime/internalDependencyClasspath/$global/export
Merge branch 'master' of https://github.com/ZeMoSoLabs/zinteract-onpremise

Conflicts:
	OnPremiseInstall/.idea/.name
	OnPremiseInstall/.idea/misc.xml
	OnPremiseInstall/.idea/workspace.xml
	OnPremiseInstall/OnPremiseInstall.iml
	OnPremiseInstall/pom.xml
	OnPremiseInstall/src/main/java/com/zinteract/agent/Application.java
	OnPremiseInstall/src/main/java/com/zinteract/agent/repos/PatternMatchRepository.java
	OnPremiseInstall/src/main/java/com/zinteract/agent/repos/QueryPropsRepository.java
	OnPremiseInstall/src/main/java/com/zinteract/agent/repos/QueryRepository.java
	OnPremiseInstall/src/main/java/com/zinteract/agent/repos/QueryScheduleRepository.java
	OnPremiseInstall/src/main/java/com/zinteract/agent/repos/ZDataSourceRepository.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/ElasticsearchResult.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/QueryProps.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/QueryResult.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/QueryRun.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/Source.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/ZDataSource.java
Merge branch 'master' of https://github.com/ZeMoSoLabs/zinteract-onpremise

Conflicts:
	OnPremiseInstall/.idea/.name
	OnPremiseInstall/.idea/misc.xml
	OnPremiseInstall/.idea/workspace.xml
	OnPremiseInstall/OnPremiseInstall.iml
	OnPremiseInstall/pom.xml
	OnPremiseInstall/src/main/java/com/zinteract/agent/Application.java
	OnPremiseInstall/src/main/java/com/zinteract/agent/repos/PatternMatchRepository.java
	OnPremiseInstall/src/main/java/com/zinteract/agent/repos/QueryPropsRepository.java
	OnPremiseInstall/src/main/java/com/zinteract/agent/repos/QueryRepository.java
	OnPremiseInstall/src/main/java/com/zinteract/agent/repos/QueryScheduleRepository.java
	OnPremiseInstall/src/main/java/com/zinteract/agent/repos/ZDataSourceRepository.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/ElasticsearchResult.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/QueryProps.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/QueryResult.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/QueryRun.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/Source.java
	OnPremiseInstall/src/main/java/com/zinteract/common/dom/ZDataSource.java