WIP
preparations for coordinate loading
shortcuts cleaned up

code formatting on server/convert.js
Merge branch 'master' into coordinates

Conflicts:
	dist/L.BuildingsLayer.js
	dist/OpenLayers.Layer.Buildings.js
	src/data.js
Merge branch 'master' into coordinates

Conflicts:
	dist/L.BuildingsLayer-debug.js
	dist/L.BuildingsLayer.js
	dist/OpenLayers.Layer.Buildings-debug.js
	dist/OpenLayers.Layer.Buildings.js
	server/config.sample.php
	server/data/convert.js
	server/functions.php
	server/index.php
	server/source/Mapnik.php
	server/source/Mysql.php
	src/data.js
	src/shortcuts.js
	src/variables.js
Data created, use of meta reduced

added importers for GeoJSON and OSM
items are objects now instead of arrays, many constants removed
color types explicitly named
straightening Data.scale()
code style fixed
Data API mostly set, server part removed

suffix simplified
JSDoc started for public methods
enabling XAPI

simplified GeoJSON handling
id added for CartoDB features
HEIGHT_SCALE factor added
returning to XHR
JSON format auto detection
center() fixed
Merge branch 'coordinates'

Conflicts:
	server/source/CartoDB.php
	src/Data.js