Merge pull request #1172 from seanpaultaylor/next

Fixed BlackBerry 10.2 Simulator builds.
Updated for libpng to png folder change
Merge branch 'next' of https://github.com/seanpaultaylor/GamePlay into next
Merge branch 'next' of https://github.com/blackberry/GamePlay into next