cmmtd
rtrte
jkjhk
Merge remote-tracking branch 'upstream/master'
committed the ui modifications on company and resource.