[test]:change App.java
[test]:ignore files
[test]:change App.java in branch dev2
Merge branch 'dev'
merge dev dev2 to master