update layouts, views
uncomment
update ignored file list