o.c.dct, .dct.ui use com.google.common instead of .guava
Merge remote-tracking branch 'origin/cleanup' into cleanup