factor out the UI scaling computation from SetScalingResolution
use GetGUIScaling rather than SetScalingResolution when computing font size so as to not alter stored state
[osx/gtest] - fix linkage of xbmc-test binary (ffmpeg now needs expliciti linkage agaoinst framework VDA, and some new source files were missing in the makefiles)
[osx] - fix cmdline linkage of lixbmc.so and xbmc.bin - there is no circular dependency linker option on osx (e.x. -Wl,--start-group/--end-group) - so we still need to link in main.a for osx.
[pvr] bump add-ons (fix version of addon.gui)
FIX: [stagefright] proper SurfaceTexture allocation
FIX: [stagefright] fixes and refactors (probable fix for 60min stuttering)
FIX: [droid] Handle mouse wheel
[musicdb] fix: fix support for .nfos and better handling for scrapers that don't return artist credits

The real underlying cause here is the change in the structure of the .nfo files.
That should be documented so folks start to update their .nfos and other scrapers.
[WIN32] removed unused methods and some CStdString occurrence.
Merge pull request #3657 from koying/quickpr

Stagefright fixes
[lang] update of internal addon language files
[lang] update of core language files
[lang] update of skin.confluence language files
[lang] added new language Tajik
Merge pull request #3656 from FernetMenta/addongui

[pvr] bump add-ons (fix version of addon.gui)
players: move more things into info structures for audio/video
dvdplayer: don't constantly hammer demuxer to get stream count

Note this could cause regressions in files where streams show
up during playback, but i think the demuxer signals such
situations now.
FIX: [droid] do not package non-standard joystick keymap
VSync: Drop OML Swap Method