Added a button for adding textures
Merge remote branch 'origin/master'