cordova upgrade plus icon set
All icons
saving icons

confirmed the version of cordova
TESTING
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.xml