Fix device override

Some devices were incorrect used. An extra override
was also added.
Fix m7-common (HTC One devices)
Cid: specify Unicode when decoding

Cid might fail loading changes with Unicode characters
in the author's name
Merge pull request #89 from therbom/master

Conflicts:
	repopick.py
	shared-repo.map