icons
Merge branch 'origin/master'
a
Merge branch 'origin/master'

Conflicts:
	kube/platforms/ios/www/index.html