company view changed
Merge branch 'charith', remote-tracking branch 'origin'
Administration pages modified