Add canvas button to master view controller
Merge remote-tracking branch 'origin/master'