Move DelhiKitchen site location
Merge master and fix conflicts