Nothi
Merge branch 'master' of https://github.com/stoffer142/MapDenmark

Conflicts:
	nbproject/private/private.properties