rename server-side project
Merge origin/master