[test]:modified App.java in dev
[test]:solve conflict between master&dev