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

Conflicts:
	src/org/factory/LoadBalancerFactory.java
Parser jackson
Merge branch 'master' of https://github.com/FuglyLionKing/HttpProxy
Parser jackson
Merge remote-tracking branch 'origin/master'

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