rename
add Jackson libraries
Merge commit '097ac3d806b484a45a0e87257b5807380a35aa2d'

Conflicts:
	swe2_3tier_client/src/interfaces/proxy/RestfulProxy.java