Merge branch 'master' of /var/www/html/Tomato with conflicts.
Delete ConsoleController

Delete ConsoleController