Implement server-side rename
Merge branch 'dev' into norton-server-rename
Update .gitignore
Merge remote-tracking branch 'origin/norton-server-rename' into dev