move multimedia uploader to its own template
refactor multimedia uploader
add icon uploader modal
icon uploader controller
remove unnecessary variable definitions
use HQMediaUploaders
fix merge conflict with autostaging
don't reuse bool widget
apply media uploader bindings
include session ID in icon uploader
specify form_path for icons
differentiate for java phone icon
choose appropriate logo uploader modal in KO
remove java_icon_uploader from context
add uploader for Android logos
add TODO
Merge branch 'master' into logos

Conflicts:
	corehq/apps/app_manager/static/app_manager/json/commcare-settings-layout.yaml
Merge branch 'logos' into fuzzy-setting+logos

Conflicts:
	corehq/apps/app_manager/static/app_manager/json/commcare-settings-layout.yaml
Update commcare-profile-settings.yaml
Update commcare-settings-layout.yaml

Fixed fuzzy-search property id
Conflicts:
	corehq/apps/app_manager/static/app_manager/json/commcare-settings-layout.yaml