updating to fix a few crash bugs
Merge branch 'TexturePicApp'