Merge branch 'master' of github.com:RobotsConf/2014 into gh-pages
Merge branch 'master' of github.com:RobotsConf/2014 into gh-pages
Adding Sponsors & clean-up
merging banches
Merge branch 'gh-pages'