Merge branch 'spring-REST'