add Sony model name
remove manufacturer from label if it is contained in model
Merge branch 'feature/fix-label' into develop

Conflicts:
	src-core/com/adbhelper/adb/AdbDevice.java