Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Fixing android compiling path
Merge pull request #777 from blackberry/master

Rebase master to next
Merge pull request #783 from blackberry/master

Rebase master to next
Merge remote-tracking branch 'upstream/master'
Updated all Xcode projects adding armv7s architecture for iPhone5 support
Merge branch 'next' of https://github.com/blackberry/GamePlay
Merge branch 'master' of https://github.com/blackberry/GamePlay
Merge pull request #787 from seanpaultaylor/master

Updated all Xcode projects adding armv7s architecture for iPhone5 support