Merge pull request #250 from bmeurant/master

use @RestController instead of @Controller + @ResponseBody