LOADUI-911 Made monitor-assertions work and ensured that regular assertions still work
Merge changes from next and refactor
More refactoring
Fixed bug with adding regular statistics and agents that appeared as a cause of this fix
Merge branch 'next' into bugfix_LOADUI-911
AssertionTest is up and running for open source
Merge branch 'next' into bugfix_LOADUI-911
LOADUI-911 fixed small problems with the tests
LOADUI-911 test now works
LOADUI-911 Got monitor assertions with 2 levels in the assertion tree working as well. Also made test test both 2 lvl and 3 lvl
LOADUI-911 Refactored, added and refactored tests, got rid of some warnings.
Merge branch 'next' into bugfix_LOADUI-911-max

Conflicts:
	loadui-fx-integration-tests/src/main/java/com/eviware/loadui/test/ui/fx/ControllerFXWrapper.java
Merge branch 'next' into bugfix_LOADUI-911-max

Conflicts:
	loadui-fx-integration-tests/src/main/java/com/eviware/loadui/test/ui/fx/ControllerFXWrapper.java
Merge branch 'next' into bugfix_LOADUI-911-max

Conflicts:
	loadui-pro-fx-integration-tests/src/main/java/com/eviware/loadui/test/ui/fx/ControllerFXWrapper.java
	loadui-pro-fx-integration-tests/src/main/java/com/eviware/loadui/test/ui/fx/OSGiFXLauncher.java
	loadui-pro-fx-integration-tests/src/test/java/com/eviware/loadui/pro/test/ui/fx/ChartCompareTest.java
	loadui-pro-fx-integration-tests/src/test/java/com/eviware/loadui/pro/test/ui/fx/MonitorOracleRacTest.java
	loadui-pro-fx-integration-tests/src/test/java/com/eviware/loadui/pro/test/ui/fx/MonitorTest.java
	loadui-pro-fx-integration-tests/src/test/java/com/eviware/loadui/test/ui/fx/monitor/MonitorOracleRacTest.java
	loadui-pro-fx-integration-tests/src/test/java/com/eviware/loadui/test/ui/fx/monitor/MonitorTest.java
	loadui-pro-fx-integration-tests/src/test/java/com/eviware/loadui/test/ui/fx/states/ChartCompareTest.java
	loadui-pro-fx-integration-tests/src/test/java/com/eviware/loadui/test/ui/fx/states/MonitorOracleRacTest.java
	loadui-pro-fx-integration-tests/src/test/java/com/eviware/loadui/test/ui/fx/states/MonitorTest.java
	loadui-pro-fx-integration-tests/src/test/java/com/eviware/loadui/test/ui/fx/statistics/ChartCompareTest.java
Merge branch 'next' into bugfix_LOADUI-911-max
LOADUI-911 small change suggested in code review
Merge branch 'next' into bugfix_LOADUI-911-max

Conflicts:
	loadui-fx-integration-tests/pom.xml
	loadui-fx-integration-tests/src/main/java/com/eviware/loadui/test/ui/fx/CanRunLoadUITests.java
	loadui-fx-integration-tests/src/main/java/com/eviware/loadui/test/ui/fx/IsProjectRunning.java
	loadui-fx-integration-tests/src/test/java/com/eviware/loadui/test/ui/fx/ScenarioLinkedPlaybackTest.java
	loadui-fx-integration-tests/src/test/java/com/eviware/loadui/test/ui/fx/tablelog/TableLogTest.java
	loadui-project/loadui-base/src/main/java/com/eviware/loadui/impl/model/WorkspaceItemImpl.java
	loadui-project/loadui-controller-base/src/main/resources/META-INF/spring/bundle-context-osgi.xml
	loadui-project/loadui-controller-base/src/main/resources/META-INF/spring/bundle-context.xml
	loadui-project/loadui-fx-interface/src/main/java/com/eviware/loadui/ui/fx/views/assertions/AssertableTree.java
	loadui-project/loadui-fx-interface/src/main/java/com/eviware/loadui/ui/fx/views/assertions/LabeledTreeCell.java
Merge branch 'next' into bugfix_LOADUI-911-max

Conflicts:
	loadui-pro-fx-integration-tests/src/test/java/com/eviware/loadui/pro/test/ui/fx/DistributionInspectorTest.java
Merge branch 'next' into bugfix_LOADUI-911-max