user story infowindow and marker [fixed #707]
Merge pull request #716 from Vizzuality/refactor/stories-layers

user story infowindow and marker [fixed #707]
fix conflict
added new bower libraries
Merge branch 'refactor/bowerify' into develop

* refactor/bowerify:
  added new bower libraries
Merge branch 'develop' into release/refactor

* develop:
  added new bower libraries
  user story infowindow and marker [fixed #707]