@Path changed to @Resource
Merge remote-tracking branch 'origin/master'