Merge remote-tracking branch 'origin/master' into ricinoMaster

Author: nmccready

.gitignore

@@ -14,7 +14,6 @@ _SpecRunner.html
 /spec/coverage
 *.iml
 /bower_components
-/curl_components
 .tmp
 /app
 /dist/coverage/

CHANGELOG.md

@@ -1,3 +1,17 @@
+<a name"2.3.4"></a>
+### 2.3.4 (2016-08-15)
+
+
+#### Bug Fixes
+
+* **build:** webpack-dev-server is a peer dependency of grunt-webpack ([e7631d28](https://github.com/angular-ui/angular-google-maps/commit/e7631d28))
+* **map-loader:** change includeScript to place maps api script tag to head element instead of bod ([8d6ed161](https://github.com/angular-ui/angular-google-maps/commit/8d6ed161))
+
+
+<a name"2.3.3"></a>
+### 2.3.3 (2016-05-13)
+
+
 <a name"2.3.2"></a>
 ### 2.3.2 (2016-02-11)
 

Gruntfile.coffee

@@ -22,7 +22,6 @@ module.exports = (grunt) ->
     'grunt-replace'
     'grunt-subgrunt'
     'grunt-debug-task'
-    'grunt-curl'
     'grunt-verbosity'
     'grunt-webpack'
     'grunt-angular-architecture-graph'
@@ -51,9 +50,7 @@ module.exports = (grunt) ->
   options.open = _.extend options.open, allExamplesOpen
   grunt.initConfig options
 
-  grunt.registerTask 'bowerCurl', ['bower', 'curl']
-
-  grunt.registerTask 'build', ['bowerCurl', 'clean:dist', 'jshint', 'mkdir', 'coffee', 'ngAnnotate',
+  grunt.registerTask 'build', ['bower', 'clean:dist', 'jshint', 'mkdir', 'coffee', 'ngAnnotate',
   'concat:libs', 'replace', 'webpack']
 
   grunt.registerTask 'buildDist', ['build', 'concat:dist']

ISSUE_TEMPLATE.md

@@ -0,0 +1,30 @@
+<!--
+Thank you for contributing!
+
+Think you found a bug?
+======================
+The best bug report is a failing test in the repository as a pull request. Otherwise, please use the "BUG REPORT" template below.
+
+Have a feature request?
+=======================
+Remove the template from below and provide thoughtful commentary *and code samples* on what this feature means for your product. What will it allow you to do that you can't do today? How will it make current work-arounds straightforward? What potential bugs and edge cases does it help to avoid? etc. Please keep it product-centric.
+-->
+
+<!-- BUG TEMPLATE -->
+Thanks to the guys of [React-Router](https://github.com/reactjs/react-router/), for [standardizing the way on how to report bugs](https://github.com/reactjs/react-router/blob/master/ISSUE_TEMPLATE.md)
+
+[An issue example](https://github.com/reactjs/react-router/issues/3480)
+
+## Version
+2.3.3
+
+## Test Case
+[http://jsbin.com/hicebe/edit?html,css,js,output](http://jsbin.com/hicebe/edit?html,css,js,output)
+
+[Direct output here](http://output.jsbin.com/hicebe/)
+
+## Steps to reproduce
+
+## Expected Behavior
+
+## Actual Behavior

README.markdown renamed to README.md

@@ -1,3 +1,13 @@
+## Project No longer actively maintained
+
+With angular 2 and other competing projects we have decided to announce that this project is no longer activley maintained. If someone desires to take over the project please contact any of the admins.
+
+As a warning this project is not activley watched by the admins and is checked here and there to fix any major issues. Therefore if something is **major**, contact someone directly via mentioning a users name/alias (will notify the user/admin).
+
+Alternatives:
+
+- [angularjs-google-maps](https://github.com/allenhwkim/angularjs-google-maps)
+- [angular2-google-maps](https://github.com/SebastianM/angular2-google-maps)
 
 # angular-google-maps
 > AngularJS directives for Google Maps
@@ -51,6 +61,12 @@ npm install && bower install
 meteor add angularui:angular-google-maps
 ```
 
+* Installing for [Meteor 1.3+](https://www.meteor.com/) application:
+
+```shell
+meteor npm install --save angular-google-maps
+```
+
 ### Building
 To build the library after you made changes, simply run grunt:
 
@@ -78,7 +94,7 @@ grunt example
 and open your browser on `http://localhost:3000/example.html`.
 
 ### Documentation
-The various directives are documented at [official site](http://angular-google-maps.org).
+The various directives are documented at [official site](http://angular-ui.github.io/angular-google-maps).
 
 ### Contributing
 

bower.json

@@ -1,11 +1,17 @@
 {
   "name": "angular-google-maps",
-  "version": "2.3.2",
+  "version": "2.3.4",
+  "license": "MIT",
   "main": "./dist/angular-google-maps.js",
   "dependencies": {
     "angular": "1.2 - 1.5",
     "angular-simple-logger": ">=0.0.1",
-    "lodash": "3.X - 4.X"
+    "lodash": "3.X - 4.X",
+    "markerclustererplus": "^2.1.4",
+    "google-maps-utility-library-v3-markerwithlabel": "git://github.com/nmccready/google-maps-utility-library-v3-markerwithlabel.git",
+    "google-maps-utility-library-v3-infobox": "^1.1.14",
+    "google-maps-utility-library-v3-keydragzoom": "^2.0.9",
+    "js-rich-marker": "*"
   },
   "ignore": [
     "*.json",