resolve merge conflicts

Author: katowulf

.gitignore

@@ -1,4 +1,5 @@
-bower_components/
+dist/
 node_modules/
+bower_components/
 tests/coverage/
 .idea

.travis.yml

@@ -22,11 +22,3 @@ env:
   global:
   - secure: mGHp1rQI11OvbBQn3PnBT5kuyo26gFl8U+nNq0Ot4opgSBX9JaHqS8Dx63uALWWU9qjy08/Mn68t/sKhayH1+XrPDIenOy/XEkkSAG60qAAowD9dRo3WaIMSOcWWYDeqdZOAWZ3LiXvjLO4Swagz5ejz7UtY/ws4CcTi2n/fp7c=
   - secure: Eao+hPFWKrHb7qUGEzLg7zdTCE//gb3arf5UmI9Z3i+DydSu/AwExXuywJYUj4/JNm/z8zyJ3j1/mdTyyt9VVyrnQNnyGH1b2oCUHkrs1NLwh5Oe4YcqUYROzoEKdDInvmjVJnIfUEM07htGMGvsLsX4MW2tqVHvD2rOwkn8C9s=
-deploy:
-  provider: npm
-  email: [email protected]
-  api_key:
-    secure: E9HfiXQdcK/pUeZyabrNof/vkM7V8lLYNuvEI9sgpDOhME8H1vwH87RGiV+50ulw0cRcYLfPC5mTFyeJ5dL244PbRMEKlvoheJyTKSNK6SnwRiGMNz4Ce4c6g5qJkwv9rYlB4jVZJPjfXGYE5Xp+MpYOkPBrTP02FbyhA/Ykr1A=
-  on:
-    tags: true
-    repo: firebase/angularFire

CHANGELOG.md

@@ -5,10 +5,17 @@ module.exports = function(grunt) {
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
     meta: {
-      banner: '/*!\n * <%= pkg.title || pkg.name %> <%= pkg.version %> <%= grunt.template.today("yyyy-mm-dd") %>\n' +
-        '<%= pkg.homepage ? " * " + pkg.homepage + "\\n" : "" %>' +
-        ' * Copyright (c) <%= grunt.template.today("yyyy") %> Firebase, Inc.\n' +
-        ' * MIT LICENSE: http://firebase.mit-license.org/\n */\n\n'
+      banner: '/*!\n' +
+              ' * AngularFire is the officially supported AngularJS binding for Firebase. Firebase\n' +
+              ' * is a full backend so you don\'t need servers to build your Angular app. AngularFire\n' +
+              ' * provides you with the $firebase service which allows you to easily keep your $scope\n' +
+              ' * variables in sync with your Firebase backend.\n' +
+              ' *\n' +
+              ' * AngularFire 0.0.0\n' +
+              ' * https://github.com/firebase/angularfire/\n' +
+              ' * Date: <%= grunt.template.today("mm/dd/yyyy") %>\n' +
+              ' * License: MIT\n' +
+              ' */\n'
     },
 
     // merge files from src/ into angularfire.js

Gruntfile.js

@@ -1,12 +1,15 @@
 
 # AngularFire
 
-[![Build Status](https://travis-ci.org/firebase/angularfire.svg)](https://travis-ci.org/firebase/angularfire)
+[![Build Status](https://travis-ci.org/firebase/angularfire.svg?branch=master)](https://travis-ci.org/firebase/angularfire)
 [![Version](https://badge.fury.io/gh/firebase%2Fangularfire.svg)](http://badge.fury.io/gh/firebase%2Fangularfire)
 
-AngularFire is the officially supported [AngularJS](http://angularjs.org/) binding
-for [Firebase](http://www.firebase.com/?utm_medium=web&utm_source=angularfire).
-Firebase is a full backend so you don't need servers to build your Angular app. AngularFire provides you with the `$firebase` service which allows you to easily keep your `$scope` variables in sync with your Firebase backend.
+AngularFire is the officially supported [AngularJS](http://angularjs.org/) binding for
+[Firebase](http://www.firebase.com/?utm_medium=web&utm_source=angularfire). Firebase is a full
+backend so you don't need servers to build your Angular app. AngularFire provides you with the
+`$firebase` service which allows you to easily keep your `$scope` variables in sync with your
+Firebase backend.
+
 
 ## Downloading AngularFire
 
@@ -17,43 +20,59 @@ In order to use AngularFire in your project, you need to include the following f
 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.17/angular.min.js"></script>
 
 <!-- Firebase -->
-<script src="https://cdn.firebase.com/js/client/1.0.18/firebase.js"></script>
+<script src="https://cdn.firebase.com/js/client/1.0.21/firebase.js"></script>
 
 <!-- AngularFire -->
 <script src="https://cdn.firebase.com/libs/angularfire/0.8.0/angularfire.min.js"></script>
 ```
 
-Use the URL above to download both the minified and non-minified versions of AngularFire from the Firebase CDN. You can also download them from the root of this GitHub repository. [Firebase](https://www.firebase.com/docs/web-quickstart.html?utm_medium=web&utm_source=angularfire) and [AngularJS](http://angularjs.org/) can be downloaded directly from their respective websites.
+Use the URL above to download both the minified and non-minified versions of AngularFire from the
+Firebase CDN. You can also download them from the
+[releases page of this GitHub repository](https://github.com/firebase/angularfire/releases).
+[Firebase](https://www.firebase.com/docs/web/quickstart.html?utm_medium=web&utm_source=angularfire) and
+[Angular](https://angularjs.org/) can be downloaded directly from their respective websites.
 
-You can also install AngularFire via Bower and the dependencies will be downloaded automatically:
+You can also install AngularFire via Bower and its dependencies will be downloaded automatically:
 
 ```bash
 $ bower install angularfire --save
 ```
 
-Once you've included AngularFire and its dependencies into your project, you will have access to the `$firebase` service.
+Once you've included AngularFire and its dependencies into your project, you will have access to
+the `$firebase` service.
 
 You can also start hacking on AngularFire in a matter of seconds on
 [Nitrous.IO](https://www.nitrous.io/?utm_source=github.com&utm_campaign=angularfire&utm_medium=hackonnitrous):
 
 [![Hack firebase/angularfire on
 Nitrous.IO](https://d3o0mnbgv6k92a.cloudfront.net/assets/hack-l-v1-3cc067e71372f6045e1949af9d96095b.png)](https://www.nitrous.io/hack_button?source=embed&runtime=nodejs&repo=firebase%2Fangularfire&file_to_open=README.md)
 
+
 ## Getting Started with Firebase
 
-AngularFire requires Firebase in order to sync data. You can [sign up here](https://www.firebase.com/docs/web-quickstart.html?utm_medium=web&utm_source=angularfire) for a free account.
+AngularFire requires Firebase in order to sync data. You can
+[sign up here](https://www.firebase.com/signup/?utm_medium=web&utm_source=angularfire) for a free
+account.
+
 
 ## Documentation
 
-The Firebase docs have a [quickstart](https://www.firebase.com/docs/web/bindings/angular/quickstart.html), [guide](https://www.firebase.com/docs/web/bindings/angular/guide.html), and [full API reference](https://www.firebase.com/docs/web/bindings/angular/api.html) for AngularFire.
+The Firebase docs have a [quickstart](https://www.firebase.com/docs/web/bindings/angular/quickstart.html?utm_medium=web&utm_source=angularfire),
+[guide](https://www.firebase.com/docs/web/bindings/angular/guide.html?utm_medium=web&utm_source=angularfire),
+and [full API reference](https://www.firebase.com/docs/web/bindings/angular/api.html?utm_medium=web&utm_source=angularfire)
+for AngularFire.
+
+We also have a [tutorial](https://www.firebase.com/tutorial/#tutorial/angular/0?utm_medium=web&utm_source=angularfire)
+to help you get started with AngularFire.
 
-We also have a [tutorial](https://www.firebase.com/tutorial/#tutorial/angular/0) to help you get started with AngularFire.
+Join our [Firebase + Angular Google Group](https://groups.google.com/forum/#!forum/firebase-angular)
+to ask questions, provide feedback, and share apps you've built with AngularFire.
 
-Join our [Firebase + Angular Google Group](https://groups.google.com/forum/#!forum/firebase-angular) to ask questions, provide feedback, and share apps you've built with Firebase and Angular.
 
 ## Contributing
 
-If you'd like to contribute to AngularFire, you'll need to run the following commands to get your environment set up:
+If you'd like to contribute to AngularFire, you'll need to run the following commands to get your
+environment set up:
 
 ```bash
 $ git clone https://github.com/firebase/angularfire.git
@@ -66,8 +85,16 @@ $ grunt install             # install Selenium server for end-to-end tests
 $ grunt watch               # watch for source file changes
 ```
 
-`grunt watch` will watch for changes in the `/src/` directory and lint, concatenate, and minify the source files when a change occurs. The output files - `angularfire.js` and `angularfire.min.js` - are written to the `/dist/` directory. `grunt watch` will also re-run the unit tests every time you update any source files.
+`grunt watch` will watch for changes in the `/src/` directory and lint, concatenate, and minify the
+source files when a change occurs. The output files - `angularfire.js` and `angularfire.min.js` -
+are written to the `/dist/` directory. `grunt watch` will also re-run the unit tests every time you
+update any source files.
 
-You can run the entire test suite via the command line using `grunt test`. To only run the unit tests, run `grunt test:unit`. To only run the end-to-end [Protractor](https://github.com/angular/protractor/) tests, run `grunt test:e2e`.
+You can run the entire test suite via the command line using `grunt test`. To only run the unit
+tests, run `grunt test:unit`. To only run the end-to-end [Protractor](https://github.com/angular/protractor/)
+tests, run `grunt test:e2e`.
 
-In addition to the automated test suite, there is an additional manual test suite that ensures that the `$firebaseSimpleLogin` service is working properly with the authentication providers. These tests can be run with `grunt test:manual`. Note that you must click "Close this window", login to Twitter, etc. when prompted in order for these tests to complete successfully.
+In addition to the automated test suite, there is an additional manual test suite that ensures that
+the `$firebaseSimpleLogin` service is working properly with the authentication providers. These tests
+can be run with `grunt test:manual`. Note that you must click "Close this window", login to Twitter,
+etc. when prompted in order for these tests to complete successfully.

README.md

@@ -1,7 +1,7 @@
 {
   "name": "angularfire",
   "description": "The officially supported AngularJS binding for Firebase",
-  "version": "0.8.0",
+  "version": "0.0.0",
   "authors": [
     "Firebase <[email protected]> (https://www.firebase.com/)"
   ],
@@ -27,7 +27,7 @@
     "firebase.json",
     "package.json",
     "Gruntfile.js",
-    "release.sh"
+    "changelog.txt"
   ],
   "dependencies": {
     "angular": "1.2.x || 1.3.x",