Removed useless line
Added a button for editing textures
Merge remote branch 'origin/master'