Finished drawing layer persistance
Merged from master
Completed Erase feature