merged:

issue angular-ui#234 angular-ui#232
Merge remote-tracking branch 'johannesjo_stream/master'

Conflicts:
	dist/angular-google-maps.min.js
	example/example.html

Author: nmccready

.gitignore

@@ -4,6 +4,7 @@
 node_modules
 old/
 tmp/
+.tmp/
 *~
 app/components
 /nbproject

Gruntfile.coffee

@@ -64,7 +64,7 @@ module.exports = (grunt) ->
                 separator: ";"
 
             dist:
-                src: ["tmp/output_coffee.js", "lib/markerclusterer.js", "lib/markerwithlabel.js"]
+                src: ["tmp/output_coffee.js", "lib/*.js"]
                 dest: "tmp/output.js"
 
         copy:

bower.json

@@ -1,13 +1,13 @@
 {
   "name": "angular-google-maps",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "main": "./dist/angular-google-maps.js",
   "dependencies": {
-    "angular": "1.2.8",
-    "underscore": "~1.5.2"
+    "angular": "1.2.x",
+    "underscore": "~1.5.x"
   },
   "devDependencies": {
-    "angular-mocks": "1.2.8",
-    "jquery": "2.0.3"
+    "angular-mocks": "1.2.x",
+    "jquery": "2.1.x"
   }
 }