add icon-72@2x.png to iOS project
adjust info.plist some
Localisation updates from http://translatewiki.net.
Merge iOS icon fixes from branch 'v3.3-iOS-alpha1'
Localisation updates from http://translatewiki.net.
* (bug 43386) Add missing map marker icon file

marker-icon.png didn't get added when updating to Leaflet 4.5. Re-adding.
de-beta the version number
Tweak/fix for Firefox in settings, nearby view

Force data type to 'json' so we get interpreted data consistently.
Localisation updates from http://translatewiki.net.
* (bug 42967, 42968, 42970, 42971) Add terms of service and privacy policy links to page footer in app

This covers iOS, Android, BB PlayBook, and Firefox OS once merged to the appropriate release branches.
Win8 app needs a similar update as a follow-up.
* (bug 42967, 42968, 42970, 42971) Add terms of service and privacy policy links to page footer in app

This covers iOS, Android, BB PlayBook, and Firefox OS once merged to the appropriate release branches.
Win8 app needs a similar update as a follow-up.
fix stupid debug left in line
fix stupid debug left in line
Force privacy/terms links to mobile view
Force privacy/terms links to mobile view
Localisation updates from http://translatewiki.net.
terms of service -> terms of use
Merge branch 'termsuse'

Conflicts:
	assets/www/messages/messages-en.properties
	assets/www/messages/messages-qqq.properties