Ignoring non framework/app-specific files in the web/ directory
Merge remote branch 'origin/release' into lightweight_queue