Merge remote-tracking branch 'origin/master'

Author: Urigo

.docs/angular-meteor/client/content/api/api.meteorObject.html

@@ -25,7 +25,7 @@
     $scope.$meteorObject(collection, selector, auto)
 
   If you documents are saved with objects IDs (and not strings:  <a href="http://docs.meteor.com/#/full/mongo_collection" >see here </a>),
-you should use <code> new Mongo.objectID  </code> to retieve the object.
+you should use <code> new Mongo.objectID  </code> to retrieve the object.
 
     $meteor.object (collection, new Mongo.ObjectID (stringId), auto); // you can also use Meteor.Collection.ObjectID