Added 'char' and 'short' to alowed special words for Java generator.
Merge pull request #150 from msolujic/master

Added 'char' and 'short' to alowed special words for Java generator.