Java monitor code generation added
Added java.hpp, containing string templates for code generation.
fix encoding
Merge branch 'javamonitor'

Conflicts:
	Makefile
	shell.cpp