encoding..:
Merge branch 'master' of
github.com:ftomassetti/codemodels-javaparserwrapper

Conflicts:
	lib/codemodels/javaparserwrapper/parserwrapper.rb
Merge branch 'master' of github.com:ftomassetti/codemodels-javaparserwrapper