Get map options from scope, instead of parsing HTML-embedded JSON
Merge branch 'refs/heads/master-dev' into my-dev

Conflicts:
	src/js/directives/map.js
Switching to use model as the main watcher in MarkerChildModel. Less watches mean better performance. Also removed the @myScope.model = model out of setMyScope as this was causing the watch be entered twice.
Removed animate attribute to use options instead for both Window,Windows, Marker, and Markers. MarkerChildModel functionality is slightly more complicated but it should be faster. MarkerChildModel fixes for handleClick event errors on closing windows.
Get map options from scope, instead of parsing HTML-embedded JSON
Rebuilt from sources, fixed lint errors.
Merge branch 'refs/heads/nlaplante-r1-dev' into r1-dev

Conflicts:
	dist/angular-google-maps.min.js
Rebuilt, added options to example
Merge pull request #80 from dmitrybelyakov/r1-dev

[r1-dev] Get map options from scope, instead of parsing HTML-embedded JSON
fixed mergeing errors