cloudmade to mapbox test
Merge branch 'master' into openaid-dev

Conflicts:
	js/map.js