Added missing files to CMakeLists.txt for NormalMap generation.
Merge branch 'master' of https://github.com/blackberry/GamePlay
Merge pull request #822 from seanpaultaylor/master

Fixes #821
Merge pull request #823 from blackberry/master

Merge master to next