Development team
Merge remote-tracking branch 'github/master'
Finished the settings tab on the drawing view
Fixed draw icon on main screen
Merge remote-tracking branch 'github/master'