add company, terms pages and header / footer links
Merge remote-tracking branch 'upstream/master'
Version update on release