Merge pull request #964 from sgrenier/next

Fix to Lua path resolution.
Renamed FileSystem::dirname() to getDirectoryName
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Merge pull request #966 from dgough/next

Renamed FileSystem::dirname() to getDirectoryName
Minor fixes.
- Fixes problem in encoder with generation materials that have names with non-alphanumeric characters in them.
- Model::getMaterial(int) now returns NULL instead of asserting if material index is not valid.