Merging 2.2pre source base - trivial differences only
Merging 2.2pre source base - removing bad practice new String instances
Merging 2.2pre source base - Upgrading version info
More device names supported and some unnecessary new Strings style fixes