add company info page
add link company info page
change encode
merge company-info
change url
merge company-info
Merge branch 'master' into gh-pages