New Favourites dialog layout. Strings settings fixes.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	720p/IncludesSkinWidgets.xml