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
Merge pull request #1174 from seanpaultaylor/next

Next
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Updated VS2012 project files for libpng14 to libpng change
Merge branch 'next' of https://github.com/seanpaultaylor/GamePlay into next

Conflicts:
	samples/browser/sample-browser.vcxproj
	samples/character/sample-character.vcxproj
	samples/mesh/sample-mesh.vcxproj
	samples/particles/sample-particles.vcxproj
	samples/racer/sample-racer.vcxproj
	samples/spaceship/sample-spaceship.vcxproj
	template/template.vcxproj
Merge pull request #1175 from seanpaultaylor/next

Next
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Fixing up compile errors.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Updated Android for libpng changes.
Merge pull request #1176 from seanpaultaylor/next

Updated Android for libpng changes.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next