Merge branch 'ftpcatfix'
Merge branch 'author-content'
Added 127.0.0.1 guide
Merge branch 'guide-bye127' into preview