fixed iconPath for cartodb.js
added image markers
Merge branch 'develop' of github.com:CartoDB/cartodb.js into develop
Merge branch 'develop' of github.com:CartoDB/cartodb.js into develop