20141014 JAVA work
Merge branch 'master' of github.com:razrLeLe/work