Site reorganization
Fixed bad url
Merge remote-tracking branch 'upstream/master'