WorkFlow
Merge remote-tracking branch 'origin/master'

Conflicts:
	source/maps.Db/maps.Db.dbmdl
	source/maps.Model/app.config
	source/maps.Model/mapsDb.dbml
	source/maps.Model/mapsDb.dbml.layout
	source/maps.Model/mapsDb.designer.cs
	source/maps.v12.suo