Correct some typos in icons/user/README
Merge branch 'dev'

Conflicts:
	icons/user/README
Correct undeclared variable
Add adjust to iconmeta.json.dist
Merge branch 'dev'
Merge branch 'dev'
Rename misnamed file
Rename
Update README