dev commit 3
Merge branch 'master' of https://github.com/orangedy/javatest.git into dev