Add core, mvc and WebApp config
Merge origin/master