Updated gitignore
Merge branch 'integration' into wdt
Merge branch 'wdt' into integration