Working on constraints
Merge remote-tracking branch 'github/master'
Added toolbar to drawing pane