missing license header
fixed other NPE in Itemstackconverter
Merge branch 'origin/master'