For #27 - Added MapType enumeration
For #27 - Added new 'mapType' property to user settings
For #27 - load saved map type
Merge branch 'dev' into change_default_map_type

Conflicts:
	src/main/java/org/traccar/web/shared/model/UserSettings.java