[ios64] - fixed offsets into the eventmem for arm64 - fixes bt keyboard cursor keys when compiled for arm64
[gui] auto height textboxes should take into account the cell height of the last row, which may be more than the lineheight for well-spaced fonts
[json] - fix jsonbuilder was not found when added to "PATH" from outside. Add the same approach like done in codegenerator.mk - fixes json generation when compiling from xcode
[airplay] - fix possible bad access as reported in http://issues.xbmc.org/main/issues/13
Merge pull request #4690 from jmarshallnz/auto_textbox_height_fix

[gui] auto height textboxes should take into account the cell height of last row
Merge pull request #4695 from Memphiz/badaccess

[airplay] - fix possible bad access as reported in
Merge pull request #4248 from Memphiz/btcursorkeys64bit

[ios/arm64] - fix bt keyboard cursor keys when compiled for 64bit arm
settings: fix deserialization of list setting with empty default value
Merge pull request #4694 from Memphiz/fixjsongeneration

[json] - fix jsonbuilder was not found when added to "PATH" from outside...
Merge remote-tracking branch 'upstream/master'