Routes tool
Routes for controller
Merge remote-tracking branch 'origin/master'