change the file name
test
modify in test1 branch
change the path javaplot with ubuntu
add sysout
add dev1
Merge branch 'dev1' into test1

Conflicts:
	sampler/src/main/java/com/sample/ui/Demo.java
test1