add a new vocabulary file
update the Git_HOWTO.txt
Merge branch 'master' into java