Fixed conficts when update to Meteor 0.9.1.1
Merge branch 'master' of https://github.com/thaisonle94/xBuddy