Per Olav Flaten # 012
 - Implemented data class for DataSource
See previous commit message
Merge branch 'markers' of https://github.com/persn/Lommeradaren.git into
markers

Conflicts:
	Lommeradaren/src/no/kystverket/markers/dummy.java