Hmm...
Merge branch 'master' of https://github.com/wilwayco/JerseyExperiments

Conflicts:
	.idea/artifacts/JerseyExperiments_war_exploded.xml
	JerseyExperiments.iml
Merge branch 'master' of https://github.com/wilwayco/JerseyExperiments

Conflicts:
	.idea/artifacts/JerseyExperiments_war_exploded.xml
	JerseyExperiments.iml
Use Spring 3.2.5.RELEASE