Resolved conflicts with master by removing unnecessary custom module.
Resolved conflicts with master by removing unnecessary custom module.

TheNeikos/conrod,youprofit/conrod,tempbottle/conrod,viperscape/conrod,natemara/conrod