Added New tool View Controller
Merge remote-tracking branch 'origin/master'