updating website links
merging website updatesMerge remote-tracking branch 'upstream/master'
updating authors and web pages