Added satelite view to settings page
added satelite view to settings page
Merge branch 'master' of https://github.com/carvoyant/carfinder

Conflicts:
	Resources/ui/common/SettingsWindow.js