Add IntelliJ IDEA ignore resources.
Merge remote-tracking branch 'origin/master'
Update module settings.