add Gson
fix merge
Merge branch 'master' of https://github.com/nicolasfavier/rssViewer
add tomcat 7 plugin