Merge pull request #11 from Geodan/master

merge from steven
Working concept of layer mngr
Merge branch 'master' of https://github.com/tomvantilburg/icm-ui
Merge pull request #2 from Geodan/master

pull request 20140225
diff text
Merge pull request #33 from stvno/master

eerste poging alerts
Working overlays
Merge pull request #12 from Geodan/master

merge from steven
Merge branch 'master' of https://github.com/tomvantilburg/icm-ui

Conflicts:
	templates/beeld.html
Merge branch 'master' of https://github.com/MartijnHeuff/icm-ui

Conflicts:
	index.html
	src/beeldCtrl.js
	templates/beeld.html
test
newline
Merge pull request #34 from stvno/master

tekst beeld en duobeeld tweaks
content without diff information for editing
blub..
Merge branch 'master' of https://github.com/Geodan/icm-ui

Conflicts:
	templates/beeld.html
Merge pull request #36 from tomvantilburg/master

layers
css red
Merge branch 'master' of https://github.com/Geodan/icm-ui

Conflicts:
	css/app.css
	src/beeldCtrl.js
	templates/beeld.html
Merge branch 'master' of https://github.com/stvno/icm-ui

Conflicts:
	src/incidentenCtrl.js