git ignore

admin connection
Merge remote-tracking branch 'origin/master' into convert-JSON