Upgrade to spring 4.0 and add a requiered lib for mock (related with spring 4.0 use servlet 3.0)
Add a deprecated class in spring 3.2 and removed from spring 4.0
Change dependecy to org.springframework.util.CachingMapDecorator to new class (same but in other path)
Merge branch 'josejuanmontiel-develop' into develop