Merge pull request #4934 from koying/fixjnitypo

FIX: [jni] typo
Merge pull request #4905 from FernetMenta/skipframe

renderer: allow some lateness within vblank interval
Merge pull request #4926 from Memphiz/osxfixpython

[osx/depends] - add a fake Info.plist to target python26 for allowing codesign...
Merge pull request #4927 from mkortstiege/masterprompt

prompt for master pin in case the addon manager is locked
Merge pull request #4950 from Memphiz/osxfixoptical

[AE/osxsink] - fix wrong samplerate selection
Merge pull request #4955 from Memphiz/osxfixoptical2

[AE/osxsink] - fix optical usb devices with > 2 channels
Merge branch 'Gotham' of https://github.com/xbmc/xbmc into Gotham