Merge remote-tracking branch 'CT/V-1.7'
Updated for "MyLocation" Text
updated NEW proxy files
Updated config.js
Added the National Geo thumbnail
Added icon for shortcut
cleared clientid and clientSecret values
Merge branch 'proxyupdate'
Update config.js
Updated link to new Local Government Solutions site
Update config.js
Simplified image URL
Simplified URLs
Merge remote-tracking branch 'upstream/master' into V-1.8