20140424
Merge branch 'dev' of github.com:ukouryou/java_test into dev