merge from develop
Merge branch 'develop' into gh-pages

Conflicts:
	vecnik.debug.js
Merge branch 'develop' into gh-pages

Conflicts:
	vecnik.debug.js
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
retina test added
reverted retina test
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
new build
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
retina detection moved to layer
enabling cartodb_id's on vector tile

this is a manual hack. making such identifiers configurable next