Merge pull request #1561 from seanpaultaylor/next

Fixed GL_ASSERTS to GP_ASSERTS
Fixed #1562. Directory switch bug in Platform::displayFileDialog for Windows
Merge branch 'next' of https://github.com/blackberry/GamePlay into next