Merge pull request xbmc#3740 from koying/fixdroidextplayer

FIX: External Player support for Android. See: http://forum.xbmc.org/sho...

cximage: additional fix for 0e3d166

Merge pull request xbmc#3329 from ace20022/lang_fixes

[Fix] Fix preferred audio/subtitle language mechanism.

[cosmetic] Fix two member function definitions on the same line

Merge pull request xbmc#2998 from arnova/pictures_crash_fix

fixed: Crash in GUIPicturesWindow caused by PR2890 (fixes xbmc#14500)

Merge pull request xbmc#2914 from manio/patch-1

cosmetics: correct typo in DVDPlayerCodec.cpp

Merge pull request xbmc#2802 from Hollow011/master

Fixes build broken by xbmc#2789

bump version to 12.2

Merge pull request xbmc#2674 from arnova/dvdplayer_displaytime_fix

fixed: DVDPlayer GUI display time not updating near the end of file (fix...

[WIN32] added make-xbmc.bat to just build debug or release builds wit…

…h jenkins.