Remove unneeded asset files
Merge mentors controller