merge 2 terms app / plugin + should be done in the next 2 weeks
merge 2 terms app / plugin + should be done in the next 2 weeks