Merge branch 'master' into patch-2

Conflicts:
	angularfire/angularfire.d.ts

angularfire/angularfire-tests.ts

@@ -46,7 +46,7 @@ myapp.controller("MyController", ["$scope", "$firebase", '$FirebaseObject', '$Fi
 
         // AngularFireObject
         {
-            var obj = sync.$asObject();
+            var obj = $FirebaseObject(ref);
 
             // $id
             if (obj.$id !== ref.name()) throw "error";
@@ -63,7 +63,7 @@ myapp.controller("MyController", ["$scope", "$firebase", '$FirebaseObject', '$Fi
             });
 
             // $ref()
-            if (obj.$ref() !== sync) throw "error";
+            if (obj.$ref() !== ref) throw "error";
 
             // $bindTo()
             obj.$bindTo($scope, "data").then(function () {
@@ -92,10 +92,10 @@ myapp.controller("MyController", ["$scope", "$firebase", '$FirebaseObject', '$Fi
 
         // AngularFireArray
         {
-            var list = sync.$asArray();
+            var list = $FirebaseArray(ref);
 
             // $ref()
-            if (list.$ref() !== sync) throw "error";
+            if (list.$ref() !== ref) throw "error";
 
             // $add()
             list.$add({ foo: "foo value" });

angularfire/angularfire.d.ts

@@ -94,7 +94,7 @@ interface AngularFireObject extends AngularFireSimpleObject {
 	/**
 	 * @returns {Firebase} the original Firebase instance used to create this object.
 	 */
-	$ref(): AngularFire;
+	$ref(): Firebase;
 
 	/**
 	 * Creates a 3-way data sync between this object, the Firebase server, and a
@@ -277,7 +277,7 @@ interface AngularFireArray extends Array<AngularFireSimpleObject> {
 	/**
 	 * @returns {Firebase} the original Firebase ref used to create this object.
 	 */
-	$ref(): AngularFire;
+	$ref(): Firebase;
 
 	/**
 	 * Listeners passed into this method are notified whenever a new change (add, updated,