Parser jackson
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/esgi/server/Proxy.java