Lukas Martinelli f3a507473e Merge branch 'master' into feature/transportation
Conflicts:
	Makefile
	layers/transportation/README.md
	layers/transportation/mapping.png
	layers/transportation_name/README.md
2016-11-30 18:59:46 +00:00
..
2016-11-29 11:07:29 +01:00
2016-11-29 11:07:29 +01:00
2016-11-30 17:03:55 +00:00
2016-11-29 11:07:29 +01:00
2016-11-29 11:07:29 +01:00