Normal Mapping: Improved light equation
Merge branch 'dev'