Updated gitignore to ignore code generated file
Merge remote-tracking branch 'origin/master' into Glass-Mapper