update meteor
Merge branch 'hackathon_max'