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
Update README.md
Update mysql-UPDATE-0.1.8a.sql

Dropped unused MySQL columns.
Merge branch 'v0.1.8a'

Conflicts:
	server/data/mysql-UPDATE-0.1.8a.sql
MySQL sample data replaced with latest version of Berlin and London
Merge branch 'v0.1.8a'
test config reverted to old structure

be careful on merging ENGINES
new build
Update mysql-CREATE_TABLE.sql

key region_id fixed
preparations for CartoDB backend

setStyle shadows fixed
zoom alpha fine tuning
enabling material colors
Merge branch 'master' of https://github.com/kekscom/osmbuildings
CartoDB backend finished

config updated
some cleanup
removing test data from CartoDB service
fixing CartoDB error message
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()