Latest spring version;
String configuration refactored;
Merge branch 'feature/spring' into develop