updated spring version to 3.2, externalized properties
Fix conflicts