Added clio site feature. Move convert action from tab to page
Merge branch 'master' into test