diff --git a/assets/icons/mapicons/underground.png b/assets/icons/mapicons/underground.png
diff --git a/assets/icons/mapicons/university.png b/assets/icons/mapicons/university.png
diff --git a/assets/icons/mapicons/usfootball.png b/assets/icons/mapicons/usfootball.png
diff --git a/assets/icons/mapicons/van.png b/assets/icons/mapicons/van.png
diff --git a/assets/icons/mapicons/vespa.png b/assets/icons/mapicons/vespa.png
diff --git a/assets/icons/mapicons/veterinary.png b/assets/icons/mapicons/veterinary.png
diff --git a/assets/icons/mapicons/video.png b/assets/icons/mapicons/video.png
diff --git a/assets/icons/mapicons/videogames.png b/assets/icons/mapicons/videogames.png
diff --git a/assets/icons/mapicons/villa.png b/assets/icons/mapicons/villa.png
diff --git a/assets/icons/mapicons/vineyard-2.png b/assets/icons/mapicons/vineyard-2.png
diff --git a/assets/icons/mapicons/volcano-2.png b/assets/icons/mapicons/volcano-2.png
diff --git a/assets/icons/mapicons/volleyball.png b/assets/icons/mapicons/volleyball.png
diff --git a/assets/icons/mapicons/waiting.png b/assets/icons/mapicons/waiting.png
diff --git a/assets/icons/mapicons/walkingtour.png b/assets/icons/mapicons/walkingtour.png
diff --git a/assets/icons/mapicons/war.png b/assets/icons/mapicons/war.png
diff --git a/assets/icons/mapicons/warehouse-2.png b/assets/icons/mapicons/warehouse-2.png
diff --git a/assets/icons/mapicons/water.png b/assets/icons/mapicons/water.png
diff --git a/assets/icons/mapicons/watercraft.png b/assets/icons/mapicons/watercraft.png
diff --git a/assets/icons/mapicons/waterfall-2.png b/assets/icons/mapicons/waterfall-2.png
diff --git a/assets/icons/mapicons/watermill-2.png b/assets/icons/mapicons/watermill-2.png
diff --git a/assets/icons/mapicons/waterpark.png b/assets/icons/mapicons/waterpark.png
diff --git a/assets/icons/mapicons/waterskiing.png b/assets/icons/mapicons/waterskiing.png
diff --git a/assets/icons/mapicons/watertower.png b/assets/icons/mapicons/watertower.png
diff --git a/assets/icons/mapicons/waterwell.png b/assets/icons/mapicons/waterwell.png
diff --git a/assets/icons/mapicons/waterwellpump.png b/assets/icons/mapicons/waterwellpump.png
diff --git a/assets/icons/mapicons/webcam.png b/assets/icons/mapicons/webcam.png
diff --git a/assets/icons/mapicons/wedding.png b/assets/icons/mapicons/wedding.png
diff --git a/assets/icons/mapicons/weights.png b/assets/icons/mapicons/weights.png
diff --git a/assets/icons/mapicons/wetlands.png b/assets/icons/mapicons/wetlands.png
diff --git a/assets/icons/mapicons/whale-2.png b/assets/icons/mapicons/whale-2.png
diff --git a/assets/icons/mapicons/wifi.png b/assets/icons/mapicons/wifi.png
diff --git a/assets/icons/mapicons/wiki-export.png b/assets/icons/mapicons/wiki-export.png
diff --git a/assets/icons/mapicons/wildlifecrossing.png b/assets/icons/mapicons/wildlifecrossing.png
diff --git a/assets/icons/mapicons/wind-2.png b/assets/icons/mapicons/wind-2.png
diff --git a/assets/icons/mapicons/windmill-2.png b/assets/icons/mapicons/windmill-2.png
diff --git a/assets/icons/mapicons/windsurfing.png b/assets/icons/mapicons/windsurfing.png
diff --git a/assets/icons/mapicons/windturbine.png b/assets/icons/mapicons/windturbine.png
diff --git a/assets/icons/mapicons/winebar.png b/assets/icons/mapicons/winebar.png
diff --git a/assets/icons/mapicons/winetasting.png b/assets/icons/mapicons/winetasting.png
diff --git a/assets/icons/mapicons/woodshed.png b/assets/icons/mapicons/woodshed.png
diff --git a/assets/icons/mapicons/workoffice.png b/assets/icons/mapicons/workoffice.png
diff --git a/assets/icons/mapicons/workshop.png b/assets/icons/mapicons/workshop.png
diff --git a/assets/icons/mapicons/world.png b/assets/icons/mapicons/world.png
diff --git a/assets/icons/mapicons/worldheritagesite.png b/assets/icons/mapicons/worldheritagesite.png
diff --git a/assets/icons/mapicons/worldwildway.png b/assets/icons/mapicons/worldwildway.png
diff --git a/assets/icons/mapicons/wrestling-2.png b/assets/icons/mapicons/wrestling-2.png
diff --git a/assets/icons/mapicons/yoga.png b/assets/icons/mapicons/yoga.png
diff --git a/assets/icons/mapicons/yooner.png b/assets/icons/mapicons/yooner.png
diff --git a/assets/icons/mapicons/you-are-here-2.png b/assets/icons/mapicons/you-are-here-2.png
diff --git a/assets/icons/mapicons/youthhostel.png b/assets/icons/mapicons/youthhostel.png
diff --git a/assets/icons/mapicons/zombie-outbreak1.png b/assets/icons/mapicons/zombie-outbreak1.png
diff --git a/assets/icons/mapicons/zoo.png b/assets/icons/mapicons/zoo.png
diff --git a/assets/icons/mapicons/zoom.png b/assets/icons/mapicons/zoom.png
diff --git a/assets/icons/AWZI16x16.png → assets/icons/water/AWZI16x16.png b/assets/icons/AWZI16x16.png → assets/icons/water/AWZI16x16.png
diff --git a/assets/icons/Aanvaringslocatie16x16.png → ...ts/icons/water/Aanvaringslocatie16x16.png b/assets/icons/Aanvaringslocatie16x16.png → ...ts/icons/water/Aanvaringslocatie16x16.png
diff --git a/assets/icons/Afdamming16x16.png → assets/icons/water/Afdamming16x16.png b/assets/icons/Afdamming16x16.png → assets/icons/water/Afdamming16x16.png
diff --git a/assets/icons/Appendage16x16.png → assets/icons/water/Appendage16x16.png b/assets/icons/Appendage16x16.png → assets/icons/water/Appendage16x16.png
diff --git a/assets/icons/Bassin16x16.png → assets/icons/water/Bassin16x16.png b/assets/icons/Bassin16x16.png → assets/icons/water/Bassin16x16.png
diff --git a/assets/icons/Big bag16x16.png → assets/icons/water/Big bag16x16.png b/assets/icons/Big bag16x16.png → assets/icons/water/Big bag16x16.png
diff --git a/assets/icons/Bluswater16x16.png → assets/icons/water/Bluswater16x16.png b/assets/icons/Bluswater16x16.png → assets/icons/water/Bluswater16x16.png
diff --git a/assets/icons/Brandlocatie16x16.png → assets/icons/water/Brandlocatie16x16.png b/assets/icons/Brandlocatie16x16.png → assets/icons/water/Brandlocatie16x16.png
diff --git a/assets/icons/Bres16x16.png → assets/icons/water/Bres16x16.png b/assets/icons/Bres16x16.png → assets/icons/water/Bres16x16.png
diff --git a/assets/icons/Brug16x16.png → assets/icons/water/Brug16x16.png b/assets/icons/Brug16x16.png → assets/icons/water/Brug16x16.png
diff --git a/...cons/Coordinatie plaats incident16x16.png → ...ater/Coordinatie plaats incident16x16.png b/...cons/Coordinatie plaats incident16x16.png → ...ater/Coordinatie plaats incident16x16.png
diff --git a/assets/icons/Dam16x16.png → assets/icons/water/Dam16x16.png b/assets/icons/Dam16x16.png → assets/icons/water/Dam16x16.png
diff --git a/assets/icons/Duiker16x16.png → assets/icons/water/Duiker16x16.png b/assets/icons/Duiker16x16.png → assets/icons/water/Duiker16x16.png
diff --git a/assets/icons/Gemaal16x16.png → assets/icons/water/Gemaal16x16.png b/assets/icons/Gemaal16x16.png → assets/icons/water/Gemaal16x16.png
diff --git a/assets/icons/Gezonken schip16x16.png → assets/icons/water/Gezonken schip16x16.png b/assets/icons/Gezonken schip16x16.png → assets/icons/water/Gezonken schip16x16.png
diff --git a/assets/icons/Hevel16x16.png → assets/icons/water/Hevel16x16.png b/assets/icons/Hevel16x16.png → assets/icons/water/Hevel16x16.png
diff --git a/assets/icons/Hoge waterstand16x16.png → assets/icons/water/Hoge waterstand16x16.png b/assets/icons/Hoge waterstand16x16.png → assets/icons/water/Hoge waterstand16x16.png
diff --git a/assets/icons/Illegale lozing16x16.png → assets/icons/water/Illegale lozing16x16.png b/assets/icons/Illegale lozing16x16.png → assets/icons/water/Illegale lozing16x16.png
diff --git a/assets/icons/Instabiele waterkeing16x16.png → ...cons/water/Instabiele waterkeing16x16.png b/assets/icons/Instabiele waterkeing16x16.png → ...cons/water/Instabiele waterkeing16x16.png
diff --git a/...ns/Installatie defect elektrisch16x16.png → ...er/Installatie defect elektrisch16x16.png b/...ns/Installatie defect elektrisch16x16.png → ...er/Installatie defect elektrisch16x16.png
diff --git a/assets/icons/Installatie defect16x16.png → ...s/icons/water/Installatie defect16x16.png b/assets/icons/Installatie defect16x16.png → ...s/icons/water/Installatie defect16x16.png
diff --git a/assets/icons/Inundatie16x16.png → assets/icons/water/Inundatie16x16.png b/assets/icons/Inundatie16x16.png → assets/icons/water/Inundatie16x16.png
diff --git a/assets/icons/Kadebreuk16x16.png → assets/icons/water/Kadebreuk16x16.png b/assets/icons/Kadebreuk16x16.png → assets/icons/water/Kadebreuk16x16.png
diff --git a/assets/icons/Lage waterstand16x16.png → assets/icons/water/Lage waterstand16x16.png b/assets/icons/Lage waterstand16x16.png → assets/icons/water/Lage waterstand16x16.png
diff --git a/assets/icons/Locatie borden16x16.png → assets/icons/water/Locatie borden16x16.png b/assets/icons/Locatie borden16x16.png → assets/icons/water/Locatie borden16x16.png
diff --git a/assets/icons/Noodwaterkeringen16x16.png → ...ts/icons/water/Noodwaterkeringen16x16.png b/assets/icons/Noodwaterkeringen16x16.png → ...ts/icons/water/Noodwaterkeringen16x16.png
diff --git a/assets/icons/Olie verontreiniging16x16.png → ...icons/water/Olie verontreiniging16x16.png b/assets/icons/Olie verontreiniging16x16.png → ...icons/water/Olie verontreiniging16x16.png
diff --git a/assets/icons/Opstelplaats noodpomp16x16.png → ...cons/water/Opstelplaats noodpomp16x16.png b/assets/icons/Opstelplaats noodpomp16x16.png → ...cons/water/Opstelplaats noodpomp16x16.png
diff --git a/assets/icons/Overslag locatie16x16.png → assets/icons/water/Overslag locatie16x16.png b/assets/icons/Overslag locatie16x16.png → assets/icons/water/Overslag locatie16x16.png
diff --git a/...s/icons/Peilscheiding verwijderd16x16.png → ...s/water/Peilscheiding verwijderd16x16.png b/...s/icons/Peilscheiding verwijderd16x16.png → ...s/water/Peilscheiding verwijderd16x16.png
diff --git a/assets/icons/Persleiding16x16.png → assets/icons/water/Persleiding16x16.png b/assets/icons/Persleiding16x16.png → assets/icons/water/Persleiding16x16.png
diff --git a/assets/icons/Persleidingbreuk16x16.png → assets/icons/water/Persleidingbreuk16x16.png b/assets/icons/Persleidingbreuk16x16.png → assets/icons/water/Persleidingbreuk16x16.png
diff --git a/assets/icons/Piping locatie16x16.png → assets/icons/water/Piping locatie16x16.png b/assets/icons/Piping locatie16x16.png → assets/icons/water/Piping locatie16x16.png
diff --git a/assets/icons/Rioolgemaal16x16.png → assets/icons/water/Rioolgemaal16x16.png b/assets/icons/Rioolgemaal16x16.png → assets/icons/water/Rioolgemaal16x16.png
diff --git a/assets/icons/Sideways_Arrow_Icon.png → assets/icons/water/Sideways_Arrow_Icon.png b/assets/icons/Sideways_Arrow_Icon.png → assets/icons/water/Sideways_Arrow_Icon.png
diff --git a/assets/icons/Sluis16x16.png → assets/icons/water/Sluis16x16.png b/assets/icons/Sluis16x16.png → assets/icons/water/Sluis16x16.png
diff --git a/assets/icons/Stuw16x16.png → assets/icons/water/Stuw16x16.png b/assets/icons/Stuw16x16.png → assets/icons/water/Stuw16x16.png
diff --git a/...s/icons/Tijdelijke waterkeringen16x16.png → ...s/water/Tijdelijke waterkeringen16x16.png b/...s/icons/Tijdelijke waterkeringen16x16.png → ...s/water/Tijdelijke waterkeringen16x16.png
diff --git a/assets/icons/Verontreiniging16x16.png → assets/icons/water/Verontreiniging16x16.png b/assets/icons/Verontreiniging16x16.png → assets/icons/water/Verontreiniging16x16.png
diff --git a/assets/icons/Vis16x16.png → assets/icons/water/Vis16x16.png b/assets/icons/Vis16x16.png → assets/icons/water/Vis16x16.png
diff --git a/assets/icons/Voertuig te water16x16.png → ...ts/icons/water/Voertuig te water16x16.png b/assets/icons/Voertuig te water16x16.png → ...ts/icons/water/Voertuig te water16x16.png
diff --git a/assets/icons/Zandzakken16x16.png → assets/icons/water/Zandzakken16x16.png b/assets/icons/Zandzakken16x16.png → assets/icons/water/Zandzakken16x16.png
diff --git a/assets/icons/up.png → assets/icons/water/up.png b/assets/icons/up.png → assets/icons/water/up.png
diff --git a/bower.json b/bower.json
@@ -25,7 +25,9 @@
     "ogc-schemas": "~2.2.0",
     "w3c-schemas": "~1.1.0",
     "jsonix": "~2.2.1",
-    "nvd3": "https://github.com/nvd3-community/nvd3.git#~1.7.1"
+    "nvd3": "https://github.com/nvd3-community/nvd3.git#~1.7.1",
+    "terraformer": "~1.0.4",
+    "terraformer-wkt-parser": "~1.0.0"
   },
   "resolutions": {
     "d3": ">=3.5.5"

diff --git a/data/flood_merged.geojson b/data/flood_merged.geojson
diff --git a/data/kwetsbareobjecten.geojson b/data/kwetsbareobjecten.geojson
diff --git a/data/opvanglocaties.geojson b/data/opvanglocaties.geojson
@@ -0,0 +1,17 @@
+{
+"type": "FeatureCollection",
+"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
+
+"features": [
+{ "type": "Feature", "properties": { "naam": "Kliniek \"medica\" Wieken", "omschrijvi": "ziekenhuis , opvangcapaciteit 25 bedden" }, "geometry": { "type": "Point", "coordinates": [ 5.285033144799832, 51.879651081237199 ] } },
+{ "type": "Feature", "properties": { "naam": "verzorg.h. Het Leede", "omschrijvi": "bejaardenhuis, opvangcapaciteit 50 bedden" }, "geometry": { "type": "Point", "coordinates": [ 5.090507830090041, 51.897485764310964 ] } },
+{ "type": "Feature", "properties": { "naam": "ÄV zorg locatie Emma", "omschrijvi": "bejaardenhuis, opvangcapaciteit 50 bedden" }, "geometry": { "type": "Point", "coordinates": [ 5.080380752391332, 51.893660190939862 ] } },
+{ "type": "Feature", "properties": { "naam": "Beatrix ziekenhuis", "omschrijvi": "zk, opvang speciale zorg 20, normaal 80 bed." }, "geometry": { "type": "Point", "coordinates": [ 4.958127888313602, 51.838499428843299 ] } },
+{ "type": "Feature", "properties": { "naam": "Partycentrum", "omschrijvi": "Tot 400 personen, catering aanwezig" }, "geometry": { "type": "Point", "coordinates": [ 5.18779192568477, 51.898204082331311 ] } },
+{ "type": "Feature", "properties": { "naam": "verz.h. Lingehof", "omschrijvi": "noodcapaciteit 25 bedden" }, "geometry": { "type": "Point", "coordinates": [ 5.1912567073161, 51.886614993145074 ] } },
+{ "type": "Feature", "properties": { "naam": "Hotel de Gentel", "omschrijvi": "# Beschikbare bedden op aanvraag" }, "geometry": { "type": "Point", "coordinates": [ 5.272361657634152, 51.882560590356618 ] } },
+{ "type": "Feature", "properties": { "naam": "zorgcentrum Wielewaal", "omschrijvi": "capaciteit 15-20 bedden" }, "geometry": { "type": "Point", "coordinates": [ 5.252990185845687, 51.80826038119941 ] } },
+{ "type": "Feature", "properties": { "naam": "sporthal Interweij", "omschrijvi": "tot max 2000 personen" }, "geometry": { "type": "Point", "coordinates": [ 5.244297667339519, 51.947793649048918 ] } },
+{ "type": "Feature", "properties": { "naam": "sporthal De Smidseberg", "omschrijvi": "maximaal 1500 personen" }, "geometry": { "type": "Point", "coordinates": [ 4.943673964348398, 51.903829345857915 ] } }
+]
+}
diff --git a/data/risicoobjecten.geojson b/data/risicoobjecten.geojson
diff --git a/elements/icm-core.html b/elements/icm-core.html
@@ -8,11 +8,11 @@
 <script>
 Polymer({
 	connected: false,
-	herdname: 'ontw',
+	herdname: 'eagle',
 	protocol: 'wss',
 	url: 'websocket.geodan.nl',
 	port: 443,
-	directory: 'ontw',
+	directory: 'eagle',
 	created: function(){
 	},
 	observe: {

diff --git a/elements/icm-drawmenu.html b/elements/icm-drawmenu.html
@@ -0,0 +1,25 @@
+<link rel="import" href="../bower_components/geodan-polymer/elements/g-drawingmenu.html">
+<link rel="import" href="../bower_components/paper-dialog/paper-action-dialog.html">
+<polymer-element name="icm-drawmenu" attributes="map">
+<template>
+<style>
+</style>
+
+
+<g-drawingmenu id="drawmenu" core="{{core}}" map="{{map}}"></g-drawingmenu>
+
+</template>
+
+<script>
+var tmp;
+Polymer({
+	observe: {
+		'core._projectid': 'switchProject'
+	},
+	switchProject: function(){
+
+	}
+});
+
+</script>
+</polymer-element>
diff --git a/elements/icm-incidentcrud.html b/elements/icm-incidentcrud.html
@@ -0,0 +1,78 @@
+<!--
+	Create, update or delete incident
+-->
+<polymer-element name="icm-incidentcrud" attributes='core'>
+<template>
+    <style>
+#paper-button {
+    background: steelBlue;
+    color: yellow;
+}
+    </style>
+    <paper-input id="name" label="Naam"></paper-input><br>
+    <paper-button on-click="{{crud}}">
+	  Voeg toe
+	 </paper-button>
+
+</template>
+
+<script>
+Polymer({
+	created: function(){
+
+	},
+	crud: function(a,b,c){
+		var name = this.$.name.value;
+		var project = this.core.projects({});
+		project.data('name', name)
+			.data('status','Actief')
+			.data('type', 'Geofort')
+			.data('location',{lat: 51.881892, lon: 5.110007, zoomlevel: 20})
+			.data('teams',[
+				{id: 1, name: 'Incident', boxes: [
+						{id: 1, type: 'text', name: 'Meldingen'}
+				]},
+				{id: 2, name: 'Team Populatie', boxes: [
+						{id: 2, type: 'text', name: 'Opdracht'},
+						{id: 1, type: 'text', name: 'Samenvatting'}
+				]},
+				{id: 3, name: 'Team Evacuatie', boxes: [
+						{id: 2, type: 'text', name: 'Opdracht'},
+						{id: 1, type: 'text', name: 'Samenvatting'}
+				]},
+				{id: 4, name: 'Team Opvang', boxes: [
+						{id: 2, type: 'text', name: 'Opdracht'},
+						{id: 1, type: 'text', name: 'Samenvatting'}
+				]},
+				{id: 5, name: 'Team Communicatie', boxes: [
+						{id: 2, type: 'text', name: 'Opdracht'},
+						{id: 1, type: 'text', name: 'Samenvatting'}
+				]}
+			]).sync();
+		var opvangtext = ""
+		+ "U moet de locaties zoeken waar de evacuees kunnen worden opgevangen. Gebruik hiervoor google maps en zoek naar sporthallen. Voeg in ieder geval de volgende locaties toe:"
+		+ "- Verzorgingstehuis Ter Leede, opvangcapaciteit 50 bedden<br>" 
+		+ "- Beatrix ziekenhuis, opvang speciale zorg 20, normaal 80 bed.<br>"
+		+ "- Verzorgingstehuis Lingehof, noodcapaciteit 25 bedden. <br>" 
+		+ "- Sporthal Interweij, tot max 2000 personen.<br>" 
+		+ "- Sporthal De Smidseberg, maximaal 1500 personen. <br>";
+		project.items({}).data({type: "text", team: 2, box: 2, text: "U moet zien uit te vinden waar en hoeveel bewoners in het gebied zijn.<br> Let daarbij extra op kwetsbare groepen."}).sync();
+		project.items({}).data({type: "text", team: 3, box: 2, text: "U moet de beste evacuatieroutes vinden en intekenen met behulp van de hoogtekaart. Let op de locatie van de bruggen!"}).sync();
+		project.items({}).data({type: "text", team: 4, box: 2, text: opvangtext}).sync();
+		project.items({}).data({type: "text", team: 5, box: 2, text: "U moet zorgen dat alle teams met elkaar blijven comminiceren en uiteindelijk geeft u een samenvatting aan de burgemeester."}).sync();
+	},
+	domReady: function(){
+		var self = this;
+		var core = this.core;
+
+	},
+	name: function(d){
+		return d.data('name');
+	},                      
+	date: function(d){
+		return new Date(d.created()).toLocaleString();
+	}
+
+});
+</script>
+</polymer-element>
diff --git a/elements/icm-incidentlist-simple.html b/elements/icm-incidentlist-simple.html
@@ -0,0 +1,131 @@
+<link rel="import" href="../bower_components/paper-toggle-button/paper-toggle-button.html">
+<link rel="import" href="../bower_components/paper-dialog/paper-dialog.html">
+<link rel="import" href="../bower_components/paper-button/paper-button.html">
+
+<polymer-element name="icm-incidentlist" attributes='core'>
+<template>
+    <style>
+    .incidentlist {
+    	overflow: auto;
+    	width: 600px;
+    }
+    .incident {
+    	margin-left: 100px;
+    	padding: 10px;
+    }
+    </style>
+    <h3>Kies uw incident</h3>
+    Actief - <paper-toggle-button id="archief"></paper-toggle-button> - Archief
+
+    <div class='incidentlist' style="display:{{$.archief.checked?'none':'block'}}">
+	<template repeat="{{i,idx in incidents}}">
+		<div horizontal layout  class='incident' index="{{idx}}">
+			<paper-button raised flex value="{{i.id}}" on-click="{{select}}">{{i.name}} {{i.date}} </paper-button>
+			<paper-icon-button value="{{i.id}}" icon='archive' on-click='{{delete}}'></paper-icon-button>
+		</div>
+    </template>
+    </div>
+
+    <div class='incidentlist' style="display:{{$.archief.checked?'block':'none'}}">
+    <template repeat="{{i,idx in deletedincidents}}">
+		<div horizontal layout class='incident' index="{{idx}}"> 
+			<paper-button raised flex value="{{i.id}}" on-click="{{select}}">{{i.name}} {{i.date}} </paper-button>
+			<paper-icon-button value="{{i.id}}" icon='restore' on-click='{{undelete}}'></paper-icon-button>
+		</div>
+	</template>
+    </div>
+
+
+    <paper-dialog id="dialog" transition="core-transition-center">
+	  <p>Archiveren?</p>
+	  <paper-button dismissive on-click="{{cancel}}">Nee</paper-button>
+	  <paper-button affirmative on-click="{{affirm}}">Ja</paper-button>
+	</paper-dialog>
+
+</template>
+
+<script>
+Polymer({
+	selectedid: null,
+	created: function(){
+		this.incidents = [];
+	},
+	domReady: function(){
+		var self = this;
+		var core = this.core;
+		function lastedit(d){
+			var items = d.items();
+			if (items.length > 0)
+				return new Date(_.max(items, function(x){ return x.updated(); }).updated()).toLocaleString();
+			else
+				return new Date(d.updated()).toLocaleString();
+		}
+		function makeitem(d){
+			return {
+				id: d.id(),
+				name:d.data('name') ? d.data('name'): 'unknown', 
+				status:d.data('status') ? d.data('status').name: 'unknown', 
+				date:new Date(d.created()).toLocaleString(),
+				type:d.data('type') ? d.data('type').title: 'unknown',
+				items:d.items().length,
+				lastedit:lastedit(d)
+			};
+		}
+
+		function reload(){
+			self.incidents = [];
+			self.deletedincidents = [];
+			core.projects()
+				.filter(function(d){return !d.deleted() && d.data('name');})
+				.forEach(function(d){
+					self.incidents.push(makeitem(d));
+				});
+			core.projects()
+				.filter(function(d){return d.deleted() && d.data('name');})
+				.forEach(function(d){
+					self.deletedincidents.push(makeitem(d));
+				});
+		}
+		core.projectStore().loaded.then(function(d){
+			reload();
+		});
+		core.projectStore().on('datachange', function(d){
+			reload();
+		});
+	},
+	name: function(d){
+		return d.data('name');
+	},                      
+	date: function(d){
+		return new Date(d.created()).toLocaleString();
+	},
+	live: function(d){
+		if (d.data('type') && d.data('type').name == 'live') return true;
+	},
+	select: function(a,b,c){
+		this.core.project(c.getAttribute('value'));
+		this.fire('selected');
+	},
+	delete: function(a,b,c){
+		this.selectedid = c.getAttribute('value');
+		this.$.dialog.open();
+	},
+	affirm: function(){
+		core.projects(this.selectedid).deleted(true).sync();
+		this.$.dialog.close();
+	},
+	undelete: function(a,b,c){
+		core.projects(c.getAttribute('value')).deleted(false).sync();
+	},
+	cancel: function(){
+		this.$.dialog.close();
+	}
+	//selectedChanged: function(a,b,c){
+	//	if (this.selected){
+	//		this.core.project(this.selected.id.toString());
+	//		this.fire('selected');
+	//	}
+	//}
+});
+</script>
+</polymer-element>
diff --git a/elements/icm-main.html b/elements/icm-main.html
@@ -14,25 +14,32 @@
 <link rel="import" href="../bower_components/paper-dialog/paper-action-dialog.html">
 <link rel="import" href="../bower_components/paper-icon-button/paper-icon-button.html">
 <link rel="import" href="../bower_components/paper-button/paper-button.html">
+<link rel="import" href="../bower_components/paper-item/paper-item.html">
 <link rel="import" href="../bower_components/paper-icon-button/paper-icon-button.html">
 <link rel="import" href="../bower_components/paper-toast/paper-toast.html">
-
+<!-- disabled
 <link rel="import" href="../bower_components/geodan-polymer/elements/g-cas.html">
+-->
 <link rel="import" href="../bower_components/geodan-polymer/elements/g-layercatalogus.html">
 <link rel="import" href="../bower_components/geodan-polymer/elements/gm-configreader.html">
 <link rel="import" href="../bower_components/geodan-polymer/elements/g-wmsreader.html">
 
 <link rel="import" href="../elements/icm-core.html">
 <link rel="import" href="../elements/icm-userlist.html">
-<link rel="import" href="../elements/icm-incidentlist.html">
+<link rel="import" href="../elements/icm-incidentcrud.html">
+<link rel="import" href="../elements/icm-incidentlist-simple.html">
 <link rel="import" href="../elements/icm-tekst.html">
+<link rel="import" href="../elements/icm-welcome.html">
 <link rel="import" href="../elements/icm-map.html">
+<!-- disabled
+<link rel="import" href="../elements/icm-drawmenu.html">
 <link rel="import" href="../elements/icm-plugin-natuurbrand.html">
 <link rel="import" href="../elements/icm-plugin-p2000.html">
 <link rel="import" href="../elements/icm-plugin-rail.html">
 <link rel="import" href="../elements/icm-plugin-rws.html">
 <link rel="import" href="../elements/icm-plugin-tracker.html">
-
+<link rel="import" href="../elements/icm-plugin-video.html">
+-->
 <polymer-element name="icm-main">
   <template>
   	<style>
@@ -73,6 +80,16 @@
         width: 100%;
         z-index: 1;
       }
+      #page0 {
+      	  background-color: white;
+      	  padding: 10px;
+      }
+      #page1 {
+      	  background-color: white;
+      }
+      #page2 {
+      	  background-color: white;
+      }
     paper-icon-button {
 		color: lightGray;
 	}
@@ -97,7 +114,10 @@
       	  display: block;
       	  width: 10%;
       }
-
+     icm-map {
+     	 display: block;
+
+     }
       icm-tekst {
       	  overflow: auto;
       	  display: block;
@@ -139,6 +159,17 @@
 
   <icm-core id="icmcore"></icm-core>
 
+  <paper-action-dialog  class="scrolling"  id="incidentcrud" transition="core-transition-left" heading="Nieuw incident" autoCloseDisabled>
+  	<icm-incidentcrud core="{{core}}"></icm-incidentcrud>
+  	<paper-button affirmative  autofocus>Sluit</paper-button>
+  </paper-action-dialog>
+
+  <paper-action-dialog  class="scrolling"  id="drawmenu" transition="core-transition-left" heading="Tekenen" autoCloseDisabled>
+  	<icm-drawmenu map="{{map}}"></icm-drawmenu>
+  	<paper-button affirmative  autofocus>Sluit</paper-button>
+  </paper-action-dialog>
+
+
   <paper-action-dialog  class="scrolling"  id="NBPlugin" transition="core-transition-right" heading="Natuurbrandmodel" autoCloseDisabled>
   	<icm-plugin-natuurbrand core="{{core}}" map="{{$.map}}"></icm-plugin-natuurbrand>
   	<paper-button affirmative  autofocus>Sluit</paper-button>
@@ -164,6 +195,11 @@
   	<paper-button affirmative  autofocus>Sluit</paper-button>
   </paper-action-dialog>
 
+  <paper-action-dialog  class="scrolling"  id="VideoPlugin" transition="core-transition-right" heading="Video" autoCloseDisabled>
+  	<icm-plugin-video core="{{core}}" map="{{$.map}}"></icm-plugin-video>
+  	<paper-button affirmative  autofocus>Sluit</paper-button>
+  </paper-action-dialog>
+
   <paper-action-dialog  class="scrolling"  id="layerlist" transition="core-transition-right" heading="Beschikbare lagen">
 	<div>
 		<h4>WMS:</h4>
@@ -179,39 +215,56 @@ <h4>GM-config:</h4>
   <core-header-panel flex>
     <core-toolbar layout>
 	 <h3>Eagle Research</h3>
-	 <div flex>
-	 <paper-icon-button 
-	 	icon="home" 
-	 	on-click="{{gohome}}"></paper-icon-button>
-	 <paper-icon-button id="idicon" 
-	 	icon="{{account.ID==undefined?'social:person-outline':'account-circle'}}" 
-	 	on-click="{{toggleLogin}}"></paper-icon-button>
-	 <paper-icon-button id="connectionicon" 
-	 	icon="{{$.icmcore.connected?'notification:sync':'notification:sync-disabled'}}"
-	 	class="{{$.icmcore.connected?'connected':'disconnected'}}"
-	 	on-click="{{toggleConnection}}"></paper-icon-button>
+	 <div style="display:{{$.pages.selected==0?'block':'none'}}">
+	 		<paper-icon-button
+			icon="add-box" 
+			on-click="{{toggleIncidentcrud}}"></paper-icon-button>
+	</div>
+	 <div flex style="display:{{$.pages.selected>=1?'block':'none'}}">
+		 <paper-icon-button 
+			icon="home" 
+			on-click="{{gohome}}"></paper-icon-button>
+	</div>
+	<div flex style="display:{{$.pages.selected==200?'block':'none'}}"><!--disabled-->
+		 <paper-icon-button id="idicon" 
+			icon="{{account.ID==undefined?'social:person-outline':'account-circle'}}" 
+			on-click="{{toggleLogin}}"></paper-icon-button>
+		 <paper-icon-button id="connectionicon" 
+			icon="{{$.icmcore.connected?'notification:sync':'notification:sync-disabled'}}"
+			class="{{$.icmcore.connected?'connected':'disconnected'}}"
+			on-click="{{toggleConnection}}"></paper-icon-button>
 	 </div>
-	 <div style="display:{{$.pages.selected==2?'block':'none'}}">
-	 <paper-icon-button  
-	 	icon="social:whatshot" 
-	 	on-click="{{toggleNBPlugin}}"></paper-icon-button>
-	 <paper-icon-button  
-	 	icon="device:wifi-tethering" 
-	 	on-click="{{toggleP2000Plugin}}"></paper-icon-button>
-	 <paper-icon-button  
-	 	icon="maps:directions-train" 
-	 	on-click="{{toggleRailPlugin}}"></paper-icon-button>
-	 <paper-icon-button  
-	 	icon="trending-up" 
-	 	on-click="{{toggleRwsPlugin}}"></paper-icon-button>	
-	 <paper-icon-button  
-	 	icon="image:flare" 
-	 	on-click="{{toggleTrackerPlugin}}"></paper-icon-button>	
+	 <div flex style="display:{{$.pages.selected>=2?'block':'none'}}">Uw rol:<i>{{user._id}}</i></div>
+	 <div style="display:{{$.pages.selected==200?'block':'none'}}"><!--disabled -->
+
+		 <paper-icon-button  
+			icon="social:whatshot" 
+			on-click="{{toggleNBPlugin}}"></paper-icon-button>
+
+		<paper-icon-button  
+			icon="device:wifi-tethering" 
+			on-click="{{toggleP2000Plugin}}"></paper-icon-button>
+
+		<paper-icon-button  
+			icon="maps:directions-train" 
+			on-click="{{toggleRailPlugin}}"></paper-icon-button>
+		 <paper-icon-button  
+			icon="trending-up" 
+			on-click="{{toggleRwsPlugin}}"></paper-icon-button>	
+		 <paper-icon-button  
+			icon="image:flare" 
+			on-click="{{toggleTrackerPlugin}}"></paper-icon-button>
+		 <paper-icon-button  
+			icon="image:flare" 
+			on-click="{{toggleVideoPlugin}}"></paper-icon-button>
+		 <paper-icon-button  
+			icon="trending-up" 
+			on-click="{{toggleDrawMenu}}"></paper-icon-button>
+
+		 <paper-icon-button  
+			icon="maps:layers" 
+			on-click="{{toggleLayerCatalog}}"></paper-icon-button>
 	 </div>
-	 <paper-icon-button  
-	 	icon="maps:layers" 
-	 	on-click="{{toggleLayerCatalog}}"></paper-icon-button>	
-	 </div>	
     </core-toolbar>
 
 	<div id="content" vertical layout>
@@ -225,20 +278,18 @@ <h3>Eagle Research</h3>
 
 	<core-animated-pages id="pages" selected=0 fit transitions="cross-fade">
 		<section id="page0" >
-		<paper-shadow z=2>
-		<div id="msg">
-			U bent niet aangemeld bij de geodan cloud...
-		</div>
-		</paper-shadow>
-		</section>
-		<section id="page1">
 			<div cross-fade layout vertical>
 			<icm-incidentlist id="incidentlist" core="{{core}}"></icm-incidentlist>
 			</div>
 		</section>
+		<section id="page1">
+			<paper-shadow z=2>
+			<icm-welcome core="{{core}}" user="{{user}}"></icm-welcome>
+			</paper-shadow>
+		</section>
 		<section id="page2">
 			<div cross-fade layout horizontal style="height:100%">
-				<icm-userlist core="{{core}}"></icm-userlist>
+				<!--<icm-userlist core="{{core}}"></icm-userlist>-->
 				<icm-map id="map" core="{{core}}" layers="{{layers}}"></icm-map>
 				<core-splitter id="splitter" direction="left" allowOverflow></core-splitter>
 				<icm-tekst id="textbeeld" core="{{core}}" flex on-goto-location="{{gotolocation}}"></icm-tekst>
@@ -258,18 +309,22 @@ <h3>Eagle Research</h3>
   	  var self = this;
   	  this.core = this.$.icmcore.core;
   	  core = this.core;
+  	  this.user = this.user || {};
   	  this.ws = this.core.websocket();
   	  this.account = this.account || {};
   	  this.layers = [];
   	  this.$.incidentlist.addEventListener('selected', function(d){
-  	  	self.$.pages.selected = 2;
+  	  	self.$.pages.selected = 1;
   	  });
   	  this.$.splitter.addEventListener('track', function(){
   	  		self.$.map.resize();
   	  });
   }, 
   gohome: function(){
-  	  this.$.pages.selected = 1;
+  	  this.$.pages.selected = 0;
+  },
+  toggleIncidentcrud: function(){
+  	  this.$.incidentcrud.toggle();
   },
   toggleLogin: function() {
 		this.$.login.toggle();
@@ -292,14 +347,27 @@ <h3>Eagle Research</h3>
   toggleTrackerPlugin: function() {
         this.$.TrackerPlugin.toggle();
   },
+  toggleVideoPlugin: function() {
+        this.$.VideoPlugin.toggle();
+  },
   toggleLayerCatalog: function(){
   	  this.$.layerlist.toggle();
   },
+  toggleDrawMenu: function(){
+  	  this.$.drawmenu.toggle();
+  },
   accountChanged: function(){
-		if (this.account.ID){
-			this.$.pages.selected = 1;
-			this.$.icmcore.login(this.account);
-		}
+		//TT: disabled cloud login
+  	    //if (this.account.ID){
+		//	this.$.pages.selected = 1;
+		//	this.$.icmcore.login(this.account);
+		//}
+  },
+  userChanged: function(){
+  	  if (this.user._id){
+  	  	  this.$.pages.selected = 2;
+  	  	  this.$.map.switchProject(); //delayed switch project
+  	  }
   },
   gotolocation: function(event, data){
   	  this.$.map.map.center = data.msg;

diff --git a/elements/icm-map.html b/elements/icm-map.html
@@ -1,9 +1,12 @@
 <link rel="import" href="../bower_components/paper-dialog/paper-action-dialog.html">
+<link rel="import" href="../bower_components/core-icon-button/core-icon-button.html">
+<link rel="import" href="../bower_components/core-dropdown/core-dropdown.html">
 <link rel="import" href="../bower_components/geodan-polymer/elements/g-zoommenu.html">
+<link rel="import" href="./icm-drawmenu.html">
+<link rel="import" href="../bower_components/geodan-polymer/elements/g-suggest.html">
 <link rel="import" href="../bower_components/geodan-polymer/elements/g-mapvectorlayer.html">
 <link rel="import" href="../bower_components/geodan-polymer/elements/g-maprasterlayer.html">
 <link rel="import" href="../bower_components/geodan-polymer/elements/g-map.html">
-<link rel="import" href="../bower_components/geodan-polymer/elements/g-drawingmenu.html">
 <link rel="import" href="../bower_components/geodan-polymer/elements/g-layermanager.html">
 
 <polymer-element name="icm-map" attributes="core layers">
@@ -14,14 +17,29 @@
   height: 100%;
   position: relative;
 }
+#trigger {
+	display: block;
+	position: absolute;
+	margin-left: 10px;
+	top: 70px;
+	z-index: 10;
+}
 g-layermanager {
-  display: block;
+  display: none;
   position: absolute;
-  left: 10%;
-  top: 70px;
+  left: 10px;
+  top: 120px;
   width: 300px;
   z-index: 102;
 }
+g-suggest {
+  display: block;
+  position: absolute;
+  left: 40%;
+  top: 10px;
+  width: 400px;
+  z-index: 101;
+}
 /*
 g-layercatalogus {
   display: block;
@@ -42,24 +60,25 @@
 g-zoommenu{
   display: block;
   position: absolute;
-  margin-left: 10px;
-  margin-top: 10px;
   top: 0px;
   width: 200px;
   z-index: 101;
 }
 </style>
+
+<g-suggest id="suggest"></g-suggest>
 <g-zoommenu id="zoommenu" map="{{map}}"></g-zoommenu>
-<g-drawingmenu id="drawmenu" map="{{map}}"></g-drawingmenu>
+<paper-fab mini id="trigger" icon="list" on-click="{{toggleLayers}}"></paper-fab>
 <g-layermanager id="layermngr" map="{{map}}" layers="{{layers}}"></g-layermanager>
-
-<g-map id="mapelement" layers="{{layers}}" latitude="52.2" longitude="5.2" zoomlevel="23">
+<g-drawingmenu id="drawmenu" core="{{core}}" map="{{map}}"></g-drawingmenu>
+<g-map id="mapelement" layers="{{layers}}" latitude="52.2" longitude="5.2" zoomlevel="20">
 		<g-maprasterlayer 
 			id="Mapbox"
 			type="tms"
 			url="http://{s}.tiles.mapbox.com/v3/examples.map-i86nkdio/{z}/{x}/{y}.png"
 		></g-maprasterlayer>
 		<g-mapvectorlayer id="communication" name="Communication" config="{{layerconfig}}"></g-mapvectorlayer>
+		<g-mapvectorlayer id="location" name="Search"></g-mapvectorlayer>
 </g-map>
 
 </template>
@@ -85,10 +104,20 @@
         this.activeLayers = [];
 	},
 	domReady: function(){
+		var self = this;
 		var core = this.core;
 		this.map = this.$.mapelement.map;
 		tmp = this.map;
-		this.map.zoom = 18;
+		//this.map.zoom = 24;
+		this.map.maxzoom = 30;
+		this.$.suggest.addEventListener('location', function(d){
+			var center = d.detail.msg.centroid.geometry.coordinates;
+			self.map.center = center;
+			//self.$.mapelement.map.zoomToFeature(d.detail.msg.geom); //Doesn't work yet
+			var feat = d.detail.msg.geom;
+			self.$.location.newdata([feat]);
+		});
+
 		/*
 		l = new d3.mappu.RasterLayer("Mapbox", {
 				ogc_type: 'tms',
@@ -101,13 +130,68 @@
 		});
 		this.layers.push(l);
 		*/
-		this.$.communication.addEventListener('featchanged', function(d){
+		/* Geofort layers */
+
+		var l1 = new d3.mappu.VectorLayer('Overstroming', {
+				reproject: true,
+				visible: true,
+				opacity: 0,
+				style: {
+					fill: 'none',
+					stroke: 'blue',
+				}
+		}).addTo(this.map);
+		var t = 0;
+		d3.json('./data/flood_merged.geojson', function(data){
+			data.features.forEach(function(d){
+				d.id = t++;
+			});
+			l1.data = data.features;
+		});
+		//this.layers.push(l1);
+
+
+		this.$.communication.addEventListener('editFeature', function(d){
+			var feat = d.detail;
+			self.$.drawmenu.sketch.edit(feat);//TODO: cleaner method?
+		});
+		this.$.communication.addEventListener('changeFeature', function(d){
 			var feat = d.detail;
 			var id = feat.id;
 			var item = core.project().items(id);
 			item.data('feature',feat).sync();
 		});
+		this.$.communication.addEventListener('removeFeature', function(e){
+			var id = e.detail.id;
+			if (id){
+				var item = core.project().items(id.toString());
+				item.deleted(true);
+				item.sync(); 
+			}
+			else {
+				console.warn('No id for feature given');
+			}
+		});
+
 		this.map.mapdiv.addEventListener('featureCreated', function(e){
+			//TODO: This should be arranged from the drawingmenu
+			var feature = e.detail;
+			if (feature.geometry.type == 'Point'){
+				feature.style['marker-url'] = self.$.drawmenu.selectedIcon;
+			}
+			else if (feature.geometry.type == 'LineString'){
+				feature.style.stroke = self.$.drawmenu.selectedLineColor || 'blue';
+				feature.style.fill = 'none';
+				feature.style['stroke-width'] = '4px';
+			}
+			else if (feature.geometry.type == 'Polygon'){
+				feature.style.stroke = self.$.drawmenu.selectedPolyColor || 'blue';
+				feature.style.fill = 'none'; //Fill is not usefull on map
+				feature.style['fill-opacity'] = 0.3;
+				feature.style['stroke-width'] = '2px';
+			}
+
+
 			var item = core.project().items({});
 			item.data('type', 'feature');
 			item.data('feature', e.detail);
@@ -142,6 +226,7 @@
 	switchProject: function(){
 		var self = this;
 		var core = this.core;
+		//Here's an issue: since the SVG doesn;t have a size at this moment, the map centers wrong
 		window.setTimeout(function(){ //FIXME
 			self.$.mapelement.resize();
 			self.map = self.$.mapelement.map;
@@ -211,6 +296,14 @@
 	toggleLayerCatalog: function(){
 		this.$.layerlist.toggle();
 	}*/
+	toggleLayers: function(){
+		if (this.$.layermngr.style.display != 'block'){
+			this.$.layermngr.style.display = 'block';
+		}
+		else {
+			this.$.layermngr.style.display = 'none';
+		}
+	}
 
 });
 </script>

diff --git a/elements/icm-plugin-rail.html b/elements/icm-plugin-rail.html
@@ -99,7 +99,8 @@ <h2>Trains</h2>
 		}
 		else { //OFF
 			this.locations = [];
-			clearInterval(this.treininterval);
+			//clearInterval(this.treininterval);
+			this.socket.close();
 			this.map.map.removeLayer(this.layer);
 			this.map.map.removeLayer(this.spoorvakkenlayer);
 		}
@@ -117,6 +118,8 @@ <h2>Trains</h2>
 	enable: function(){
 		var self = this;
 		var map = this.map.$.mapelement.map;
+		var m = d3.map([], function(d) { return d.id; });
+
 		if (map.mapdiv){
 			this.spoorvakkenlayer = new d3.mappu.VectorLayer('spoor', {
 				reproject: false,
@@ -174,42 +177,91 @@ <h2>Trains</h2>
 				treinnummers = d3.map(data, function(d){return d.nummer;});
 			});
 
+			var socket = new WebSocket("ws://192.168.24.15:9998",['connect']);
+			this.socket = socket;
+			socket.onopen = function(){
+				self.socketState = socket.readyState;
+			}
+			socket.onerror = function(error){
+				console.warn(error);
+				self.socketState = socket.readyState;
+			}
+			socket.onclose = function(){
+				console.log('Socket closed, readystate: ',socket.readyState);
+				self.socketState = socket.readyState;
+			}
+			socket.onmessage = function(msg){
+				var json = JSON.parse(msg.data);
+				addTrain(json);
+				//console.log(json);
+			}
+			var color = d3.scale.linear()
+				.domain([0, 40, 100,160])
+				.range(['gray', 'orange', 'red','purple']);
+			function doCircles(){
+				var circles = map.svg.select('#'+self.layer.id).selectAll('circle').data(m.values(), function(d){return d.id;});
+				circles.enter().append('circle')
+					.attr('r',5)
+					.style('fill',function(d){
+							return d.style.fill;
+					}).style('stroke',function(d){
+							return d.style.stroke;
+					});
+				circles.each(function(d){
+					if (d.x != d.x_old || d.y != d.y_old){
+						var circle = d3.select(this);
+						d.x_old = d.x;
+						d.y_old = d.y;
+						var loc = map.projection([d.x,d.y]);
+						circle.transition().duration(1000 * 10).ease('linear')
+							.attr('cx',loc[0])
+							.attr('cy',loc[1])
+							.style('fill', function(d){
+								return color(d.properties.speed);
+							}).style('stroke', 'none');
+					}
+				});
+				circles.exit().remove();
+			}
+			window.setInterval(doCircles,100);
+			//d3.timer(doCircles, 5 * 1000);
+			var counter = 0;
 			/* Prepare treindata as a geoJSON collection */
-			function treindataCallback(err,json){
-				var collection = {"type":"FeatureCollection","features":[]};
-				json.forEach(function(d){
-					if (d.Trackee.match(/OBIS/g) || d.Trackee >= 4011)
+			function addTrain(d){
+					if (d.trackeeid.match(/OBIS/g) || d.trackeeid >= 4011)
 						var color =  "#000099";
-					else if (d.Trackee.match(/OBU/g) || d.Trackee < 4011)
+					else if (d.trackeeid.match(/OBU/g) || d.trackeeid < 4011)
 						var color = "#ffff00";
 					else
 						var color = "#cccccc";
 
-					var treinnummer = treinnummers.get(Math.trunc(d.Number/100)*100);
+					//var treinnummer = treinnummers.get(Math.trunc(d.Number/100)*100);
 
 					var newlocation = {
 						type: "Feature",
 						style: {
 							fill: color,
 							stroke: color
 						},
-						id: d.Trackee,
+						id: d.trackeeid,
+						x: d.x,
+						y: d.y,
 						properties: {
-							id: d.Trackee, 
-							number: d.Number, 
-							speed: d.Speed, 
-							track: d.Track, 
-							bps: d.Bps,
-							dop: d.Dop,
-							type: treinnummer ? treinnummer.type:'..',
-							route: treinnummer ? treinnummer.route:'..',
-							bijz: treinnummer ? treinnummer.bijz:'..'
+							id: d.trackeeid, 
+							//number: d.Number, 
+							speed: d.speed, 
+							//track: d.Track, 
+							//bps: d.Bps,
+							//dop: d.Dop,
+							//type: treinnummer ? treinnummer.type:'..',
+							//route: treinnummer ? treinnummer.route:'..',
+							//bijz: treinnummer ? treinnummer.bijz:'..'
 						},
 						geometry: {
 								type: "Point",
 								coordinates: [
-									d.Longitude,
-									d.Latitude
+									d.x,
+									d.y
 									]
 						},
 						crs: {
@@ -220,11 +272,19 @@ <h2>Trains</h2>
 						}
 
 					};
-					collection.features.push(newlocation);
-				});
-				collection.features.sort(function(a,b){return a.properties.number - b.properties.number;});
-				self.locations = collection.features;
-				var rows = d3.select(self.$.trainlist).selectAll('.row').data(self.locations);
+
+				//collection.features.sort(function(a,b){return a.properties.number - b.properties.number;});
+
+				//self.layer.addFeature(newlocation);
+				m.set(newlocation.id, newlocation);
+				counter++;
+				if (counter > 1000){
+					counter = 0;
+					//doCircles();
+				}
+
+				/*
+				var rows = d3.select(self.$.trainlist).selectAll('.row').data(m.values);
 				rows.enter().append('div').classed('row', true).on('click', function(d){
 						d3.select(self.$.trainlist).selectAll('.row').classed('selected', false);
 						d3.select(this).classed('selected',true);
@@ -236,30 +296,8 @@ <h2>Trains</h2>
 						+ '<small><i>'+d.properties.bijz+'</i></small>';
 				});
 				rows.exit().remove();
-				self.layer.data = collection.features;
-			}
-			function gettreinen(t){
-				var timestring = t.toISOString();
-				var datasource_treinen = "http://research.geodan.nl/service/trein/location/api/positions?username=ns&timestamp="+timestring;
-				d3.json(datasource_treinen)
-					.header("Authorization","Basic TlNhZG1pbjoyMGludGVyY2l0eTEz")
-					.get(treindataCallback);
+				*/
 			}
-			clearInterval(this.treininterval);
-			 if (this.interval == 0){
-
-			 }
-			 else if (this.interval <= 1000){
-				 console.warn('Too small interval');
-			 }
-			 else{
-			 	 time = new Date();
-				 gettreinen(time);
-				 this.treininterval = setInterval(function(){
-					time = new Date();
-					gettreinen(time);
-				},this.interval);
-			 }
 		}	
 	}
 });

diff --git a/elements/icm-plugin-tracker.html b/elements/icm-plugin-tracker.html
@@ -102,7 +102,7 @@
 				  .attrTween("transform", translateAlong(path.node()))
 				  .each("end", function(){
 				  		  running--;
-				  		  transition()
+				  		  transition();
 				  });
 			  });
 		  }

diff --git a/elements/icm-plugin-video.html b/elements/icm-plugin-video.html
@@ -0,0 +1,75 @@
+<link rel="import" href="../bower_components/core-ajax/core-ajax.html">
+<link rel="import" href="../bower_components/core-list/core-list.html">
+<link rel="import" href="../bower_components/core-icons/social-icons.html">
+<link rel="import" href="../bower_components/core-icons/maps-icons.html">
+<link rel="import" href="../bower_components/paper-toggle-button/paper-toggle-button.html">
+<link rel="import" href="../bower_components/paper-button/paper-button.html">
+<link rel="import" href="icm-plugin.html">
+
+
+<polymer-element name="icm-plugin-video" extends="icm-plugin">
+<template>
+	<style>
+	.incidentinfo {
+		padding: 5px;
+		padding-left: 10px;
+		font-size: 8pt;
+		width: 400px;
+	}
+	core-list {
+		height: 600px;
+	}
+	.selected {
+		background: #e2e2ff;
+	}
+	</style>
+	<shadow></shadow>
+
+
+	<video width="320" height="240" controls>
+	  <source src="https://manifest.googlevideo.com/api/manifest/hls_variant/key/yt5/ip/80.113.1.130/gcr/nl/maudio/1/sparams/gcr%2Chfr%2Cid%2Cip%2Cipbits%2Citag%2Cmaudio%2Cplaylist_type%2Cpmbypass%2Cratebypass%2Csource%2Cexpire/hfr/1/fexp/907263%2C934954%2C935000%2C938028%2C9406517%2C9406921%2C9407662%2C9408026%2C9408142%2C9408706%2C9408968%2C9409060%2C9413058%2C9414602%2C948124%2C952612%2C952637%2C952642/ratebypass/yes/ipbits/0/pmbypass/yes/itag/0/id/gnQ-OL-vkqw.1/upn/d2VU7SD4xYg/signature/3371FBA0A82AF22C6650FA044CB76EA21F910583.6BBE96F2307726DD752E69234440D5030FB87CF9/source/yt_live_broadcast/playlist_type/DVR/keepalive/yes/sver/3/expire/1431032587/file/index.m3u8" type="video/mp4">
+
+	  Your browser does not support the video tag.
+	</video>
+
+
+</template>
+
+
+
+<script>
+
+Polymer({
+	socketState: null,
+	ready: function(){
+		this.super();
+		this.layer = {};
+		this.locations = [];
+	},
+	selection: null,
+	domReady: function(){
+		this.super();
+	},
+	toggle: function(e){
+		this.super();
+		if (e.srcElement.checked){ //ON
+			this.enable();
+		}
+		else { //OFF
+			this.locations = [];
+		}
+	},
+	selectionChanged: function(){
+		if (this.selection){
+			this.map.map.center = this.selection.geometry.coordinates;
+			//this.map.map.zoom = 24; //can't zoom while still centering (bug in mappu)
+		}
+
+	},
+	enable: function(){
+		var self = this;
+	}
+});
+</script>
+
+</polymer-element>
diff --git a/elements/icm-tekst.html b/elements/icm-tekst.html
@@ -16,6 +16,7 @@
 		margin-bottom: 0px;
 		padding: 10px;
 		font-size: 16pt;
+		cursor: pointer;
 	}
 	.icon {
 		width: 24px;
@@ -50,7 +51,34 @@
 <script>
 
 if (1==2){//so never....
-core.project().data('location',{lat: 53.1, lon: 5.8, zoomlevel: 20}).sync();
+var project = core.projects({});
+core.project(project.id());
+core.project()
+	.data('location',{lat: 52.16, lon: 4.493, zoomlevel: 20})
+	.data('name','Brand in Leiden')
+	.sync(); 
+core.project().data('teams',[
+	{id: 1, name: 'Incident', boxes: [
+			{id: 1, type: 'text', name: 'Meldingen'}
+	]},
+	{id: 2, name: 'Team Populatie', boxes: [
+			{id: 2, type: 'text', name: 'Opdracht'},
+			{id: 1, type: 'text', name: 'Samenvatting'}
+	]},
+	{id: 3, name: 'Team Evacuatie', boxes: [
+			{id: 2, type: 'text', name: 'Opdracht'},
+			{id: 1, type: 'text', name: 'Samenvatting'}
+	]},
+	{id: 4, name: 'Team Afzetting', boxes: [
+			{id: 2, type: 'text', name: 'Opdracht'},
+			{id: 1, type: 'text', name: 'Samenvatting'}
+	]},
+	{id: 5, name: 'Team Brandweer', boxes: [
+			{id: 2, type: 'text', name: 'Opdracht'},
+			{id: 1, type: 'text', name: 'Samenvatting'}
+	]}
+]).sync();
+
 core.project().data('teams',[
 	{id: 1, name: 'Meldingen', boxes: [
 		{id: 1, type: 'text', name: 'Acute meldingen'},

diff --git a/elements/icm-textbox-simple.html b/elements/icm-textbox-simple.html
@@ -26,6 +26,7 @@
 	#viewtext {
 		display: block;
 		background: white;
+		color: gray;
 		padding-left: 10px;
 		padding-right: 10px;
 		cursor: pointer;
@@ -143,7 +144,9 @@
 
 			var text = items[0].data('text');
 			//Some discussion going on about size update here: https://github.com/Polymer/paper-input/issues/118
-			this.$.text.value = text;
+			if (!this.dirty){ //only update when not in edit mode
+				this.$.text.value = text;
+			}
 			this.$.a1.update(this.$.text);
 			this.text = text;
 			this.itemtime = new Date(this.item.updated()).toLocaleTimeString();

diff --git a/elements/icm-textbox.html b/elements/icm-textbox.html
@@ -49,10 +49,14 @@
 	#flashbacktext {
 		display: block;
 		background: white;
+
 		padding-left: 10px;
 		padding-right: 10px;
 		cursor: pointer;
 	}
+	#viewtext {
+		color: gray;
+	}
 	#textarea {
 		display: none;
 		background: white;

diff --git a/elements/icm-userlist.html b/elements/icm-userlist.html
@@ -14,6 +14,8 @@
 		padding-left: 10px;
 	}
     </style>
+    <h3>Current user:</h3>
+    <p>{{curuser._id}}<p>
     <h3>Online users:</h3>
     <template repeat="{{user,i in users}}">
     	<paper-shadow z=2><div class='user' val="{{i}}" on-click="{{toggle}}">{{user | name}}</div></paper-shadow>
@@ -45,17 +47,20 @@ <h3>All users:</h3>
 	created: function(){
 		this.users = [];
 		this.chats = [];
+		this.curuser = {};
 	},
 	domReady: function(){
 		var self = this;
 		var core = this.core;
 
 		core.userStore().loaded.then(function(d){
+
 			self.users = core.activeUsers();
 			self.offlineusers = core.users().filter(function(d){return !d.deleted();});
 		});
 		core.peerStore().on('datachange', function(d){
 			self.users = core.activeUsers();
+			self.curuser = core.user();
 			self.offlineusers = core.users().filter(function(d){return !d.deleted();});
 			if (core.project()){
 				self.chats = core.project().items().filter(function(d){return d.data('from') && d.data('to')});

diff --git a/elements/icm-welcome.html b/elements/icm-welcome.html
@@ -0,0 +1,77 @@
+<polymer-element name="icm-welcome" attributes="core user">
+<template>
+    <style>
+    #header {
+    	padding: 10px;
+    }
+    .rol {
+    	width: 250px;
+    	display: inline-block;
+    	padding: 20px;
+    	cursor: pointer;
+    	border: 1px solid;
+    	margin: 5px;
+    }
+    </style>
+    <div id="header">
+    <h3>Welkom bij de crisismanagement workshop!</h3>
+    <p>Kies hieronder de rol die u gaat vervullen tijdens de workshop.</p>
+    </div>
+    <hr/>
+    <div>
+    <span value='populatie' on-click="{{login}}">
+        <div class="rol">
+        <h4>Populatie</h4>
+        <p>U gaat zich bezig houden met het in kaart brengen van de hoeveelheid mensen die in het rampgebied wonen en werken. </p>
+        <!--<p><img width="100%" src="../images/populatie.jpg"/></p>-->
+        </div>
+    </span>
+    <span value='evacuatie' on-click="{{login}}">
+    	<div class="rol">
+        <h4>Evacuatie</h4>
+        <p>U gaat zich bezig houden met het in kaart brengen van vluchtroutes voor mensen uit het rampgebied naar buiten het gebied.</p>
+        <!--<p><img width="100%" src="../images/evacuatie.jpg"/></p>-->
+        </div>
+    </span>
+
+    <span value='afzetting' on-click="{{login}}">
+        <div class="rol">
+        <h4>Opvang</h4>
+        <p>U gaat zich bezig houden met de locaties zoeken waar de evacuees kunnen worden opgevangen. </p>
+        <!--<p><img width="100%" src="../images/opvang.jpg" /></p>-->
+        </div>
+    </span>
+    <span value='brandweer' on-click="{{login}}">
+		<div class="rol">
+		<h4>Communicatie</h4>
+		<p>U gaat zorgen dat alle teams met elkaar blijven comminiceren en uiteindelijk geeft u een samenvatting aan de burgemeester.</p>
+		<!--<p><img width="100%" src="../images/communicatie.jpg"/></p>-->
+		</div>
+	</span>
+	</div>
+</template>
+
+<script>
+
+Polymer({
+	created: function(){
+	},
+	domReady: function(){
+		var core = this.core;
+	},
+	login: function(a,b,c){
+		var userid = c.getAttribute('value');
+		if (core.users(userid)){
+			core.user(userid);
+			core.user().data('name', userid).sync();
+		}
+		else {
+			core.users({_id: userid}).sync();
+			core.user(userid);
+			core.user().data('name', userid).sync();
+		}
+		this.user = core.user();
+	}
+});
+</script>
+</polymer-element>
diff --git a/images/communicatie.jpg b/images/communicatie.jpg
diff --git a/images/evacuatie.jpg b/images/evacuatie.jpg
diff --git a/images/mapicons/mapicons/2hand.png b/images/mapicons/mapicons/2hand.png
diff --git a/images/mapicons/mapicons/360degrees.png b/images/mapicons/mapicons/360degrees.png
diff --git a/images/mapicons/mapicons/abduction.png b/images/mapicons/mapicons/abduction.png
diff --git a/images/mapicons/mapicons/aboriginal.png b/images/mapicons/mapicons/aboriginal.png
diff --git a/images/mapicons/mapicons/accesdenied.png b/images/mapicons/mapicons/accesdenied.png
diff --git a/images/mapicons/mapicons/acupuncture.png b/images/mapicons/mapicons/acupuncture.png
diff --git a/images/mapicons/mapicons/administration.png b/images/mapicons/mapicons/administration.png
diff --git a/images/mapicons/mapicons/administrativeboundary.png b/images/mapicons/mapicons/administrativeboundary.png
diff --git a/images/mapicons/mapicons/aed-2.png b/images/mapicons/mapicons/aed-2.png
diff --git a/images/mapicons/mapicons/agritourism.png b/images/mapicons/mapicons/agritourism.png
diff --git a/images/mapicons/mapicons/air_fixwing.png b/images/mapicons/mapicons/air_fixwing.png
diff --git a/images/mapicons/mapicons/aircraftcarrier.png b/images/mapicons/mapicons/aircraftcarrier.png
diff --git a/images/mapicons/mapicons/aircraftsmall.png b/images/mapicons/mapicons/aircraftsmall.png
diff --git a/images/mapicons/mapicons/airport.png b/images/mapicons/mapicons/airport.png
diff --git a/images/mapicons/mapicons/airport_apron.png b/images/mapicons/mapicons/airport_apron.png
diff --git a/images/mapicons/mapicons/airport_runway.png b/images/mapicons/mapicons/airport_runway.png
diff --git a/images/mapicons/mapicons/airport_terminal.png b/images/mapicons/mapicons/airport_terminal.png
diff --git a/images/mapicons/mapicons/airshow-2.png b/images/mapicons/mapicons/airshow-2.png
diff --git a/images/mapicons/mapicons/algae.png b/images/mapicons/mapicons/algae.png
diff --git a/images/mapicons/mapicons/alien.png b/images/mapicons/mapicons/alien.png
diff --git a/images/mapicons/mapicons/alligator.png b/images/mapicons/mapicons/alligator.png
diff --git a/images/mapicons/mapicons/ambulance.png b/images/mapicons/mapicons/ambulance.png
diff --git a/images/mapicons/mapicons/amphitheater-2.png b/images/mapicons/mapicons/amphitheater-2.png
diff --git a/images/mapicons/mapicons/amphitheater.png b/images/mapicons/mapicons/amphitheater.png
diff --git a/images/mapicons/mapicons/anchorpier.png b/images/mapicons/mapicons/anchorpier.png
diff --git a/images/mapicons/mapicons/anemometer_mono.png b/images/mapicons/mapicons/anemometer_mono.png
diff --git a/images/mapicons/mapicons/animal-shelter-export.png b/images/mapicons/mapicons/animal-shelter-export.png
diff --git a/images/mapicons/mapicons/anniversary.png b/images/mapicons/mapicons/anniversary.png
diff --git a/images/mapicons/mapicons/ant-export.png b/images/mapicons/mapicons/ant-export.png
diff --git a/images/mapicons/mapicons/anthropo.png b/images/mapicons/mapicons/anthropo.png
diff --git a/images/mapicons/mapicons/apartment-3.png b/images/mapicons/mapicons/apartment-3.png
diff --git a/images/mapicons/mapicons/apple.png b/images/mapicons/mapicons/apple.png
diff --git a/images/mapicons/mapicons/aquarium.png b/images/mapicons/mapicons/aquarium.png
diff --git a/images/mapicons/mapicons/arch.png b/images/mapicons/mapicons/arch.png
diff --git a/images/mapicons/mapicons/archery.png b/images/mapicons/mapicons/archery.png
diff --git a/images/mapicons/mapicons/army.png b/images/mapicons/mapicons/army.png
diff --git a/images/mapicons/mapicons/art-museum-2.png b/images/mapicons/mapicons/art-museum-2.png
diff --git a/images/mapicons/mapicons/artgallery.png b/images/mapicons/mapicons/artgallery.png
diff --git a/images/mapicons/mapicons/atm-2.png b/images/mapicons/mapicons/atm-2.png
diff --git a/images/mapicons/mapicons/atv.png b/images/mapicons/mapicons/atv.png
diff --git a/images/mapicons/mapicons/audio.png b/images/mapicons/mapicons/audio.png
diff --git a/images/mapicons/mapicons/australianfootball.png b/images/mapicons/mapicons/australianfootball.png
diff --git a/images/mapicons/mapicons/avalanche1.png b/images/mapicons/mapicons/avalanche1.png
diff --git a/images/mapicons/mapicons/award.png b/images/mapicons/mapicons/award.png
diff --git a/images/mapicons/mapicons/badminton-2.png b/images/mapicons/mapicons/badminton-2.png
diff --git a/images/mapicons/mapicons/bags.png b/images/mapicons/mapicons/bags.png
diff --git a/images/mapicons/mapicons/bank.png b/images/mapicons/mapicons/bank.png
diff --git a/images/mapicons/mapicons/bar.png b/images/mapicons/mapicons/bar.png
diff --git a/images/mapicons/mapicons/bar_coktail.png b/images/mapicons/mapicons/bar_coktail.png
diff --git a/images/mapicons/mapicons/bar_juice.png b/images/mapicons/mapicons/bar_juice.png
diff --git a/images/mapicons/mapicons/barbecue.png b/images/mapicons/mapicons/barbecue.png
diff --git a/images/mapicons/mapicons/barber.png b/images/mapicons/mapicons/barber.png
diff --git a/images/mapicons/mapicons/barrier.png b/images/mapicons/mapicons/barrier.png
diff --git a/images/mapicons/mapicons/baseball.png b/images/mapicons/mapicons/baseball.png
diff --git a/images/mapicons/mapicons/basketball.png b/images/mapicons/mapicons/basketball.png
diff --git a/images/mapicons/mapicons/bats.png b/images/mapicons/mapicons/bats.png
diff --git a/images/mapicons/mapicons/battlefield.png b/images/mapicons/mapicons/battlefield.png
diff --git a/images/mapicons/mapicons/battleship-3.png b/images/mapicons/mapicons/battleship-3.png
diff --git a/images/mapicons/mapicons/beach.png b/images/mapicons/mapicons/beach.png
diff --git a/images/mapicons/mapicons/beachvolleyball.png b/images/mapicons/mapicons/beachvolleyball.png
diff --git a/images/mapicons/mapicons/beautifulview.png b/images/mapicons/mapicons/beautifulview.png
diff --git a/images/mapicons/mapicons/beautysalon.png b/images/mapicons/mapicons/beautysalon.png
diff --git a/images/mapicons/mapicons/bed_breakfast1-2.png b/images/mapicons/mapicons/bed_breakfast1-2.png
diff --git a/images/mapicons/mapicons/beergarden.png b/images/mapicons/mapicons/beergarden.png
diff --git a/images/mapicons/mapicons/bicycle_shop.png b/images/mapicons/mapicons/bicycle_shop.png
diff --git a/images/mapicons/mapicons/bigcity.png b/images/mapicons/mapicons/bigcity.png
diff --git a/images/mapicons/mapicons/bike_downhill.png b/images/mapicons/mapicons/bike_downhill.png
diff --git a/images/mapicons/mapicons/bike_rising.png b/images/mapicons/mapicons/bike_rising.png
diff --git a/images/mapicons/mapicons/billiard-2.png b/images/mapicons/mapicons/billiard-2.png
diff --git a/images/mapicons/mapicons/binoculars.png b/images/mapicons/mapicons/binoculars.png
diff --git a/images/mapicons/mapicons/birds-2.png b/images/mapicons/mapicons/birds-2.png
diff --git a/images/mapicons/mapicons/blast.png b/images/mapicons/mapicons/blast.png
diff --git a/images/mapicons/mapicons/boardercross.png b/images/mapicons/mapicons/boardercross.png
diff --git a/images/mapicons/mapicons/boat.png b/images/mapicons/mapicons/boat.png
diff --git a/images/mapicons/mapicons/boatcrane.png b/images/mapicons/mapicons/boatcrane.png
diff --git a/images/mapicons/mapicons/bobsleigh.png b/images/mapicons/mapicons/bobsleigh.png
diff --git a/images/mapicons/mapicons/bollie.png b/images/mapicons/mapicons/bollie.png
diff --git a/images/mapicons/mapicons/bomb.png b/images/mapicons/mapicons/bomb.png
diff --git a/images/mapicons/mapicons/bomber-2.png b/images/mapicons/mapicons/bomber-2.png
diff --git a/images/mapicons/mapicons/bouddha.png b/images/mapicons/mapicons/bouddha.png
diff --git a/images/mapicons/mapicons/bowling.png b/images/mapicons/mapicons/bowling.png
diff --git a/images/mapicons/mapicons/boxing.png b/images/mapicons/mapicons/boxing.png
diff --git a/images/mapicons/mapicons/bread.png b/images/mapicons/mapicons/bread.png
diff --git a/images/mapicons/mapicons/brewery1.png b/images/mapicons/mapicons/brewery1.png
diff --git a/images/mapicons/mapicons/bridge_modern.png b/images/mapicons/mapicons/bridge_modern.png
diff --git a/images/mapicons/mapicons/bridge_old.png b/images/mapicons/mapicons/bridge_old.png
diff --git a/images/mapicons/mapicons/bulldozer.png b/images/mapicons/mapicons/bulldozer.png
diff --git a/images/mapicons/mapicons/bullfight.png b/images/mapicons/mapicons/bullfight.png
diff --git a/images/mapicons/mapicons/bunker-2-2.png b/images/mapicons/mapicons/bunker-2-2.png
diff --git a/images/mapicons/mapicons/bus.png b/images/mapicons/mapicons/bus.png
diff --git a/images/mapicons/mapicons/busstop.png b/images/mapicons/mapicons/busstop.png
diff --git a/images/mapicons/mapicons/bustour.png b/images/mapicons/mapicons/bustour.png
diff --git a/images/mapicons/mapicons/butcher-2.png b/images/mapicons/mapicons/butcher-2.png
diff --git a/images/mapicons/mapicons/butterfly-2.png b/images/mapicons/mapicons/butterfly-2.png
diff --git a/images/mapicons/mapicons/cabin-2.png b/images/mapicons/mapicons/cabin-2.png
diff --git a/images/mapicons/mapicons/cablecar.png b/images/mapicons/mapicons/cablecar.png
diff --git a/images/mapicons/mapicons/cafetaria.png b/images/mapicons/mapicons/cafetaria.png
diff --git a/images/mapicons/mapicons/calendar-3.png b/images/mapicons/mapicons/calendar-3.png
diff --git a/images/mapicons/mapicons/campfire-2.png b/images/mapicons/mapicons/campfire-2.png
diff --git a/images/mapicons/mapicons/camping-2.png b/images/mapicons/mapicons/camping-2.png
diff --git a/images/mapicons/mapicons/candy.png b/images/mapicons/mapicons/candy.png
diff --git a/images/mapicons/mapicons/canyon-2.png b/images/mapicons/mapicons/canyon-2.png
diff --git a/images/mapicons/mapicons/canyon.png b/images/mapicons/mapicons/canyon.png
diff --git a/images/mapicons/mapicons/car.png b/images/mapicons/mapicons/car.png
diff --git a/images/mapicons/mapicons/caraccident.png b/images/mapicons/mapicons/caraccident.png
diff --git a/images/mapicons/mapicons/carrental.png b/images/mapicons/mapicons/carrental.png
diff --git a/images/mapicons/mapicons/carwash.png b/images/mapicons/mapicons/carwash.png
diff --git a/images/mapicons/mapicons/casino-2.png b/images/mapicons/mapicons/casino-2.png
diff --git a/images/mapicons/mapicons/castle-2.png b/images/mapicons/mapicons/castle-2.png
diff --git a/images/mapicons/mapicons/cathedral.png b/images/mapicons/mapicons/cathedral.png
diff --git a/images/mapicons/mapicons/catholicgrave.png b/images/mapicons/mapicons/catholicgrave.png
diff --git a/images/mapicons/mapicons/caution.png b/images/mapicons/mapicons/caution.png
diff --git a/images/mapicons/mapicons/cave-2.png b/images/mapicons/mapicons/cave-2.png
diff --git a/images/mapicons/mapicons/cctv.png b/images/mapicons/mapicons/cctv.png
diff --git a/images/mapicons/mapicons/cemetary.png b/images/mapicons/mapicons/cemetary.png
diff --git a/images/mapicons/mapicons/channelchange.png b/images/mapicons/mapicons/channelchange.png
diff --git a/images/mapicons/mapicons/chapel-2.png b/images/mapicons/mapicons/chapel-2.png
diff --git a/images/mapicons/mapicons/chart-2.png b/images/mapicons/mapicons/chart-2.png
diff --git a/images/mapicons/mapicons/cheese.png b/images/mapicons/mapicons/cheese.png
diff --git a/images/mapicons/mapicons/chemistry-2.png b/images/mapicons/mapicons/chemistry-2.png
diff --git a/images/mapicons/mapicons/chicken-2.png b/images/mapicons/mapicons/chicken-2.png
diff --git a/images/mapicons/mapicons/childmuseum01.png b/images/mapicons/mapicons/childmuseum01.png
diff --git a/images/mapicons/mapicons/chiropractor.png b/images/mapicons/mapicons/chiropractor.png
diff --git a/images/mapicons/mapicons/christmasmarket.png b/images/mapicons/mapicons/christmasmarket.png
diff --git a/images/mapicons/mapicons/church-2.png b/images/mapicons/mapicons/church-2.png
diff --git a/images/mapicons/mapicons/cinema.png b/images/mapicons/mapicons/cinema.png
diff --git a/images/mapicons/mapicons/circus.png b/images/mapicons/mapicons/circus.png
diff --git a/images/mapicons/mapicons/citysquare.png b/images/mapicons/mapicons/citysquare.png
diff --git a/images/mapicons/mapicons/citywalls.png b/images/mapicons/mapicons/citywalls.png
diff --git a/images/mapicons/mapicons/climbing.png b/images/mapicons/mapicons/climbing.png
diff --git a/images/mapicons/mapicons/clock.png b/images/mapicons/mapicons/clock.png
diff --git a/images/mapicons/mapicons/closedroad.png b/images/mapicons/mapicons/closedroad.png
diff --git a/images/mapicons/mapicons/clothers_female.png b/images/mapicons/mapicons/clothers_female.png
diff --git a/images/mapicons/mapicons/clothers_male.png b/images/mapicons/mapicons/clothers_male.png
diff --git a/images/mapicons/mapicons/cloudy.png b/images/mapicons/mapicons/cloudy.png
diff --git a/images/mapicons/mapicons/cloudysunny.png b/images/mapicons/mapicons/cloudysunny.png
diff --git a/images/mapicons/mapicons/coffee.png b/images/mapicons/mapicons/coffee.png
diff --git a/images/mapicons/mapicons/coins.png b/images/mapicons/mapicons/coins.png
diff --git a/images/mapicons/mapicons/comedyclub.png b/images/mapicons/mapicons/comedyclub.png
diff --git a/images/mapicons/mapicons/comics.png b/images/mapicons/mapicons/comics.png
diff --git a/images/mapicons/mapicons/comment-map-icon.png b/images/mapicons/mapicons/comment-map-icon.png
diff --git a/images/mapicons/mapicons/communitycentre.png b/images/mapicons/mapicons/communitycentre.png
diff --git a/images/mapicons/mapicons/company.png b/images/mapicons/mapicons/company.png
diff --git a/images/mapicons/mapicons/compost.png b/images/mapicons/mapicons/compost.png
diff --git a/images/mapicons/mapicons/computers.png b/images/mapicons/mapicons/computers.png
diff --git a/images/mapicons/mapicons/condominium.png b/images/mapicons/mapicons/condominium.png
diff --git a/images/mapicons/mapicons/conference.png b/images/mapicons/mapicons/conference.png
diff --git a/images/mapicons/mapicons/congress.png b/images/mapicons/mapicons/congress.png
diff --git a/images/mapicons/mapicons/construction.png b/images/mapicons/mapicons/construction.png
diff --git a/images/mapicons/mapicons/constructioncrane.png b/images/mapicons/mapicons/constructioncrane.png
diff --git a/images/mapicons/mapicons/contract.png b/images/mapicons/mapicons/contract.png
diff --git a/images/mapicons/mapicons/conveniencestore.png b/images/mapicons/mapicons/conveniencestore.png
diff --git a/images/mapicons/mapicons/convent-2.png b/images/mapicons/mapicons/convent-2.png
diff --git a/images/mapicons/mapicons/conversation-map-icon.png b/images/mapicons/mapicons/conversation-map-icon.png
diff --git a/images/mapicons/mapicons/convertible.png b/images/mapicons/mapicons/convertible.png
diff --git a/images/mapicons/mapicons/corral.png b/images/mapicons/mapicons/corral.png
diff --git a/images/mapicons/mapicons/country.png b/images/mapicons/mapicons/country.png
diff --git a/images/mapicons/mapicons/court.png b/images/mapicons/mapicons/court.png
diff --git a/images/mapicons/mapicons/cow-export.png b/images/mapicons/mapicons/cow-export.png
diff --git a/images/mapicons/mapicons/cowabduction.png b/images/mapicons/mapicons/cowabduction.png
diff --git a/images/mapicons/mapicons/craftstore.png b/images/mapicons/mapicons/craftstore.png
diff --git a/images/mapicons/mapicons/cramschool.png b/images/mapicons/mapicons/cramschool.png
diff --git a/images/mapicons/mapicons/cricket.png b/images/mapicons/mapicons/cricket.png
diff --git a/images/mapicons/mapicons/crimescene.png b/images/mapicons/mapicons/crimescene.png
diff --git a/images/mapicons/mapicons/cromlech.png b/images/mapicons/mapicons/cromlech.png
diff --git a/images/mapicons/mapicons/cropcircles.png b/images/mapicons/mapicons/cropcircles.png
diff --git a/images/mapicons/mapicons/cross-2.png b/images/mapicons/mapicons/cross-2.png
diff --git a/images/mapicons/mapicons/crossingguard.png b/images/mapicons/mapicons/crossingguard.png
diff --git a/images/mapicons/mapicons/cruiseship.png b/images/mapicons/mapicons/cruiseship.png
diff --git a/images/mapicons/mapicons/cup.png b/images/mapicons/mapicons/cup.png
diff --git a/images/mapicons/mapicons/curling-2.png b/images/mapicons/mapicons/curling-2.png
diff --git a/images/mapicons/mapicons/currencyexchange.png b/images/mapicons/mapicons/currencyexchange.png
diff --git a/images/mapicons/mapicons/customs.png b/images/mapicons/mapicons/customs.png
diff --git a/images/mapicons/mapicons/cycling.png b/images/mapicons/mapicons/cycling.png
diff --git a/images/mapicons/mapicons/cycling_feed.png b/images/mapicons/mapicons/cycling_feed.png
diff --git a/images/mapicons/mapicons/cycling_sprint.png b/images/mapicons/mapicons/cycling_sprint.png
diff --git a/images/mapicons/mapicons/dam.png b/images/mapicons/mapicons/dam.png
diff --git a/images/mapicons/mapicons/dance_class.png b/images/mapicons/mapicons/dance_class.png
diff --git a/images/mapicons/mapicons/dancinghall.png b/images/mapicons/mapicons/dancinghall.png
diff --git a/images/mapicons/mapicons/database.png b/images/mapicons/mapicons/database.png
diff --git a/images/mapicons/mapicons/daycare.png b/images/mapicons/mapicons/daycare.png
diff --git a/images/mapicons/mapicons/deepseafishing.png b/images/mapicons/mapicons/deepseafishing.png
diff --git a/images/mapicons/mapicons/deer.png b/images/mapicons/mapicons/deer.png