Added conrine option
Fixed some bugs
Changed settings
Added some files
Merge branch 'master' of https://github.com/Geodan/gmi

Conflicts:
	js/natuurbrandmodel.js