cleaned up CustomMarker by removing unused code and increasing encapsulation, and added javadocs for it
renamed Dem class to DemFile
changed references of Dem to DemFile
updated licence text
Merge branch 'master' of https://github.com/WaterApps/water-plane-app